Wed Jul 21 15:31:29 2021 UTC ()
qt5-qtbase: fix build on Darwin. No need for -lexecinfo.


(tnn)
diff -r1.111 -r1.112 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.111 -r1.112 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2021/07/06 19:50:09 1.111
+++ pkgsrc/x11/qt5-qtbase/Makefile 2021/07/21 15:31:28 1.112
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.111 2021/07/06 19:50:09 rhialto Exp $ 1# $NetBSD: Makefile,v 1.112 2021/07/21 15:31:28 tnn Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 6 5PKGREVISION= 6
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
11CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
12CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
13CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
14CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
@@ -87,31 +87,35 @@ LDFLAGS+= -L/usr/local/lib/bind -lbind @@ -87,31 +87,35 @@ LDFLAGS+= -L/usr/local/lib/bind -lbind
87BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind 87BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
88SYS_LIBS= -lbind -ldb -ldl 88SYS_LIBS= -lbind -ldb -ldl
89.elif ${OPSYS} == "DragonFly" 89.elif ${OPSYS} == "DragonFly"
90CONFIGURE_ARGS+= -platform freebsd-g++ 90CONFIGURE_ARGS+= -platform freebsd-g++
91LDFLAGS+= -lexecinfo 91LDFLAGS+= -lexecinfo
92.elif ${OPSYS} == "Darwin" 92.elif ${OPSYS} == "Darwin"
93CONFIGURE_ARGS+= -platform macx-clang 93CONFIGURE_ARGS+= -platform macx-clang
94CONFIGURE_ARGS+= -no-framework 94CONFIGURE_ARGS+= -no-framework
95# pkgsrc has a patch to avoid using SDK, but the configure 95# pkgsrc has a patch to avoid using SDK, but the configure
96# logic gets confused if it can't find the header files 96# logic gets confused if it can't find the header files
97# so give it a direct path to them if they aren't installed 97# so give it a direct path to them if they aren't installed
98# in /usr/include 98# in /usr/include
99. if !exists(/usr/include) 99. if !exists(/usr/include)
100CONFIGURE_ARGS+= -I "$$(xcrun --show-sdk-path)"/usr/include 100CONFIGURE_ARGS+= -I ${OSX_SDK_PATH}/usr/include
101. endif 101. endif
102. if exists(/usr/lib/libresolv.dylib) 102. if exists(/usr/lib/libresolv.dylib)
103LDFLAGS+= -lresolv 103LDFLAGS+= -lresolv
104. endif 104. endif
 105# -lexecinfo is bundled in libc
 106. if exists(${OSX_SDK_PATH}/usr/include/execinfo.h)
 107BUILDLINK_TRANSFORM+= rm:-lexecinfo
 108. endif
105.elif ${OPSYS} == "Linux" 109.elif ${OPSYS} == "Linux"
106LDFLAGS+= -ldl 110LDFLAGS+= -ldl
107.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" 111.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
108. if exists(/usr/lib/libexecinfo.so) 112. if exists(/usr/lib/libexecinfo.so)
109LDFLAGS+= -lexecinfo 113LDFLAGS+= -lexecinfo
110. endif 114. endif
111LDFLAGS.FreeBSD+= -lutil 115LDFLAGS.FreeBSD+= -lutil
112.endif 116.endif
113 117
114REPLACE_PERL+= bin/fixqt4headers.pl 118REPLACE_PERL+= bin/fixqt4headers.pl
115REPLACE_PERL+= bin/syncqt.pl 119REPLACE_PERL+= bin/syncqt.pl
116REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl 120REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl
117 121