Sun Mar 31 19:00:24 2019 UTC ()
qt5-qtbase: workaround to get package building correctly on redhat/centos


(markd)
diff -r1.71 -r1.72 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.71 -r1.72 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2019/03/27 10:16:34 1.71
+++ pkgsrc/x11/qt5-qtbase/Makefile 2019/03/31 19:00:24 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.71 2019/03/27 10:16:34 markd Exp $ 1# $NetBSD: Makefile,v 1.72 2019/03/31 19:00:24 markd Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5COMMENT= C++ X GUI toolkit 5COMMENT= C++ X GUI toolkit
6 6
7.include "../../x11/qt5-qtbase/Makefile.common" 7.include "../../x11/qt5-qtbase/Makefile.common"
8 8
9HAS_CONFIGURE= yes 9HAS_CONFIGURE= yes
10CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 10CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
11CONFIGURE_ARGS+= -I "${PREFIX}/include" 11CONFIGURE_ARGS+= -I "${PREFIX}/include"
12CONFIGURE_ARGS+= -L "${PREFIX}/lib" 12CONFIGURE_ARGS+= -L "${PREFIX}/lib"
13CONFIGURE_ARGS+= -opensource -confirm-license 13CONFIGURE_ARGS+= -opensource -confirm-license
14CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 14CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
@@ -85,26 +85,32 @@ CFLAGS+= -I/usr/local/include/bind @@ -85,26 +85,32 @@ CFLAGS+= -I/usr/local/include/bind
85LDFLAGS+= -L/usr/local/lib/bind -lbind 85LDFLAGS+= -L/usr/local/lib/bind -lbind
86BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 86BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
87SYS_LIBS= -lbind -ldb -ldl 87SYS_LIBS= -lbind -ldb -ldl
88.elif ${OPSYS} == "DragonFly" 88.elif ${OPSYS} == "DragonFly"
89CONFIGURE_ARGS+= -platform freebsd-g++ 89CONFIGURE_ARGS+= -platform freebsd-g++
90LDFLAGS+= -lexecinfo 90LDFLAGS+= -lexecinfo
91.elif ${OPSYS} == "Darwin" 91.elif ${OPSYS} == "Darwin"
92CONFIGURE_ARGS+= -platform macx-clang 92CONFIGURE_ARGS+= -platform macx-clang
93CONFIGURE_ARGS+= -no-framework 93CONFIGURE_ARGS+= -no-framework
94. if exists(/usr/lib/libresolv.dylib) 94. if exists(/usr/lib/libresolv.dylib)
95LDFLAGS+= -lresolv 95LDFLAGS+= -lresolv
96. endif 96. endif
97.elif ${OPSYS} == "Linux" 97.elif ${OPSYS} == "Linux"
 98 FIXME: Try to move fix upstream
 99# See $$lcan in mkspecs/features/qt_configure.prf
 100# Also QMAKE_DEFAULT_LIBDIRS in mkspecs/features/toolchain.prf
 101. if ${LOWER_VENDOR} == "redhat" && ${MACHINE_ARCH} == "x86_64"
 102CONFIGURE_ARGS+= -L "/usr/lib64"
 103. endif
98LDFLAGS+= -ldl 104LDFLAGS+= -ldl
99.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" 105.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
100. if exists(/usr/lib/libexecinfo.so) 106. if exists(/usr/lib/libexecinfo.so)
101LDFLAGS+= -lexecinfo 107LDFLAGS+= -lexecinfo
102. endif 108. endif
103LDFLAGS.FreeBSD+= -lutil 109LDFLAGS.FreeBSD+= -lutil
104.endif 110.endif
105 111
106REPLACE_PERL+= bin/fixqt4headers.pl 112REPLACE_PERL+= bin/fixqt4headers.pl
107REPLACE_PERL+= bin/syncqt.pl 113REPLACE_PERL+= bin/syncqt.pl
108REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl 114REPLACE_PERL+= mkspecs/features/data/unix/findclasslist.pl
109 115
110PTHREAD_OPTS+= require 116PTHREAD_OPTS+= require