pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase x11/qt5-qtbase: fix darwin compile when...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/53d51fe7eff5
branches:  trunk
changeset: 346002:53d51fe7eff5
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Dec 24 06:21:20 2019 +0000

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

diffstat:

 x11/qt5-qtbase/Makefile |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 28d4a7c78561 -r 53d51fe7eff5 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Tue Dec 24 06:20:41 2019 +0000
+++ b/x11/qt5-qtbase/Makefile   Tue Dec 24 06:21:20 2019 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index