CVS commit: pkgsrc/x11/qt5-qtbase

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Tue Dec 24 06:21:20 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile

Log Message:
x11/qt5-qtbase: fix darwin compile when headers not in /usr/include


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/x11/qt5-qtbase/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.85 pkgsrc/x11/qt5-qtbase/Makefile:1.86
--- pkgsrc/x11/qt5-qtbase/Makefile:1.85 Sun Nov  3 09:14:16 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile      Tue Dec 24 06:21:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2019/11/03 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2019/12/24 06:21:20 dbj Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -92,6 +92,13 @@ LDFLAGS+=                    -lexecinfo
 .elif ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=               -platform macx-clang
 CONFIGURE_ARGS+=               -no-framework
+   # pkgsrc has a patch to avoid using SDK, but the configure
+   # logic gets confused if it can't find the header files
+   # so give it a direct path to them if they aren't installed
+   # in /usr/include
+.  if !exists(/usr/include)
+CONFIGURE_ARGS+=       -I "$$(xcrun --show-sdk-path)"/usr/include
+.  endif
 .  if exists(/usr/lib/libresolv.dylib)
 LDFLAGS+=                      -lresolv
 .  endif