Fri Jun 23 17:29:12 2023 UTC ()
qt5-qtbase: Fix logic.


(jperkin)
diff -r1.133 -r1.134 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.133 -r1.134 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2023/06/10 18:26:57 1.133
+++ pkgsrc/x11/qt5-qtbase/Makefile 2023/06/23 17:29:12 1.134
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.133 2023/06/10 18:26:57 adam Exp $ 1# $NetBSD: Makefile,v 1.134 2023/06/23 17:29:12 jperkin Exp $
2 2
3DISTNAME= qtbase-everywhere-opensource-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-opensource-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"
@@ -44,27 +44,27 @@ CONFIGURE_ARGS+= -system-doubleconversio @@ -44,27 +44,27 @@ CONFIGURE_ARGS+= -system-doubleconversio
44CONFIGURE_ARGS+= -system-libmd4c 44CONFIGURE_ARGS+= -system-libmd4c
45.if defined(MAKE_JOBS) 45.if defined(MAKE_JOBS)
46. if !defined(MAKE_JOBS_SAFE) || ${MAKE_JOBS_SAFE:U:tl} != no 46. if !defined(MAKE_JOBS_SAFE) || ${MAKE_JOBS_SAFE:U:tl} != no
47CONFIGURE_ENV+= MAKEFLAGS=-j${MAKE_JOBS} 47CONFIGURE_ENV+= MAKEFLAGS=-j${MAKE_JOBS}
48. endif 48. endif
49.endif 49.endif
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
52 52
53.if ${OPSYS} != "Darwin" 53.if ${OPSYS} != "Darwin"
54CONFIGURE_ARGS+= -fontconfig 54CONFIGURE_ARGS+= -fontconfig
55QMAKE_CONF= qmake.conf 55QMAKE_CONF= qmake.conf
56. if ${OPSYS} != "SunOS" && \ 56. if ${OPSYS} != "SunOS" && \
57 ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 57 (${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64)
58CONFIGURE_ARGS+= -reduce-relocations 58CONFIGURE_ARGS+= -reduce-relocations
59. endif 59. endif
60.else 60.else
61CONFIGURE_ARGS+= -no-rpath # avoid @rpath in dylibs 61CONFIGURE_ARGS+= -no-rpath # avoid @rpath in dylibs
62QMAKE_CONF= qmake.conf.mac 62QMAKE_CONF= qmake.conf.mac
63.endif 63.endif
64 64
65PLIST_VARS+= egl 65PLIST_VARS+= egl
66 66
67.include "../../mk/compiler.mk" 67.include "../../mk/compiler.mk"
68 68
69QMAKE_LFLAGS_GCSECTIONS?= -Wl,--gc-sections 69QMAKE_LFLAGS_GCSECTIONS?= -Wl,--gc-sections
70QMAKE_LFLAGS_RELEASE?= -Wl,-O1 70QMAKE_LFLAGS_RELEASE?= -Wl,-O1