commit 6f26eae077af2b4e1f51e9a9524617937afc8e36
author Eric Engestrom <eric.engestrom@intel.com> Sat Sep 14 22:18:32 2019 +0100
committer Eric Engestrom <eric.engestrom@intel.com> Tue Oct 08 16:26:50 2019 +0100
tree ab6122d2d527f438702ee79552ab7c7f3f18695d
parent 02b3aa3cf302eff3e8247a1767331657b8cefb29

meson: fix sys/mkdev.h detection on Solaris

On Solaris, sys/sysmacros.h has long-deprecated copies of major() & minor()
but not makedev().
sys/mkdev.h has all three and is the preferred choice.

Let's make sure we check for all 3 major(), minor() and makedev().

Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>

meson.build

diff --git a/meson.build b/meson.build
index 8f30a94..20c40f1 100644
--- a/meson.build
+++ b/meson.build
@@ -1052,9 +1052,14 @@
 endif
 
 # Check for standard headers and functions
-if cc.has_header_symbol('sys/sysmacros.h', 'major')
+if (cc.has_header_symbol('sys/sysmacros.h', 'major') and
+  cc.has_header_symbol('sys/sysmacros.h', 'minor') and
+  cc.has_header_symbol('sys/sysmacros.h', 'makedev'))
   pre_args += '-DMAJOR_IN_SYSMACROS'
-elif cc.has_header_symbol('sys/mkdev.h', 'major')
+endif
+if (cc.has_header_symbol('sys/mkdev.h', 'major') and
+  cc.has_header_symbol('sys/mkdev.h', 'minor') and
+  cc.has_header_symbol('sys/mkdev.h', 'makedev'))
   pre_args += '-DMAJOR_IN_MKDEV'
 endif