From caff799ccbdbc407a535dcc267d46bde2c7e35d3 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Mon, 14 Jun 2021 01:40:38 -0400
Subject: [PATCH] [build] look for port.h on Solaris, not sys/port.h

---
 SConstruct         | 2 +-
 src/CMakeLists.txt | 2 +-
 src/config.h.cmake | 2 +-
 src/meson.build    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index ce3bced2..b57ff2e7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -371,6 +371,7 @@ if 1:
 		'inttypes.h',
 		'linux/random.h',
 		'poll.h',
+		'port.h',
 		'pwd.h',
 		'stdint.h',
 		'stdlib.h',
@@ -382,7 +383,6 @@ if 1:
 		'sys/inotify.h',
 		'sys/loadavg.h',
 		'sys/poll.h',
-		'sys/port.h',
 		'sys/prctl.h',
 		'sys/sendfile.h',
 		'sys/time.h',
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 680c6cac..5ff287f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -96,7 +96,6 @@ check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
 check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
 check_include_files(sys/loadavg.h HAVE_SYS_LOADAVG_H)
 check_include_files(sys/poll.h HAVE_SYS_POLL_H)
-check_include_files(sys/port.h HAVE_SYS_PORT_H)
 check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H)
 check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
 check_include_files(sys/sendfile.h HAVE_SYS_SENDFILE_H)
@@ -111,6 +110,7 @@ check_include_files(pthread.h HAVE_PTHREAD_H)
 check_include_files(getopt.h HAVE_GETOPT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
 check_include_files(poll.h HAVE_POLL_H)
+check_include_files(port.h HAVE_PORT_H)
 check_include_files(pwd.h HAVE_PWD_H)
 check_include_files(stddef.h HAVE_STDDEF_H)
 check_include_files(stdint.h HAVE_STDINT_H)
diff --git a/src/config.h.cmake b/src/config.h.cmake
index eac665e1..9925832a 100644
--- a/src/config.h.cmake
+++ b/src/config.h.cmake
@@ -13,13 +13,13 @@
 #endif
 
 /* System */
+#cmakedefine  HAVE_PORT_H
 #cmakedefine  HAVE_SYS_DEVPOLL_H
 #cmakedefine  HAVE_SYS_EPOLL_H
 #cmakedefine  HAVE_SYS_EVENT_H
 #cmakedefine  HAVE_SYS_LOADAVG_H
 #cmakedefine  HAVE_SYS_MMAN_H
 #cmakedefine  HAVE_SYS_POLL_H
-#cmakedefine  HAVE_SYS_PORT_H
 #cmakedefine  HAVE_SYS_PRCTL_H
 #cmakedefine  HAVE_SYS_RESOURCE_H
 #cmakedefine  HAVE_SYS_SENDFILE_H
diff --git a/src/meson.build b/src/meson.build
index 215dda1d..02f1552e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,7 +33,6 @@ conf_data.set('HAVE_SYS_INOTIFY_H', compiler.has_header('sys/inotify.h'))
 conf_data.set('HAVE_SYS_LOADAVG_H', compiler.has_header('sys/loadavg.h'))
 conf_data.set('HAVE_SYS_MMAN_H', compiler.has_header('sys/mman.h'))
 conf_data.set('HAVE_SYS_POLL_H', compiler.has_header('sys/poll.h'))
-conf_data.set('HAVE_SYS_PORT_H', compiler.has_header('sys/port.h'))
 conf_data.set('HAVE_SYS_PRCTL_H', compiler.has_header('sys/prctl.h'))
 conf_data.set('HAVE_SYS_RESOURCE_H', compiler.has_header('sys/resource.h'))
 conf_data.set('HAVE_SYS_SENDFILE_H', compiler.has_header('sys/sendfile.h'))
@@ -48,6 +47,7 @@ conf_data.set('HAVE_PTHREAD_H', compiler.has_header('pthread.h'))
 conf_data.set('HAVE_GETOPT_H', compiler.has_header('getopt.h'))
 conf_data.set('HAVE_INTTYPES_H', compiler.has_header('inttypes.h'))
 conf_data.set('HAVE_POLL_H', compiler.has_header('poll.h'))
+conf_data.set('HAVE_PORT_H', compiler.has_header('port.h'))
 conf_data.set('HAVE_PWD_H', compiler.has_header('pwd.h'))
 conf_data.set('HAVE_STDDEF_H', compiler.has_header('stddef.h'))
 conf_data.set('HAVE_STDINT_H', compiler.has_header('stdint.h'))