Thu Feb 19 14:26:21 2015 UTC ()
-reduce-relocations is only supported on x86.


(joerg)
diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2015/01/01 21:05:13 1.16
+++ pkgsrc/x11/qt5-qtbase/Makefile 2015/02/19 14:26:21 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2015/01/01 21:05:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2015/02/19 14:26:21 joerg Exp $
2 2
3DISTNAME= qtbase-opensource-src-${QTVERSION} 3DISTNAME= qtbase-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
9.if defined(MAKE_JOBS) 9.if defined(MAKE_JOBS)
10. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) 10. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
11CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 11CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
12. endif 12. endif
13.endif 13.endif
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
@@ -31,27 +31,28 @@ CONFIGURE_ARGS+= -no-strip @@ -31,27 +31,28 @@ CONFIGURE_ARGS+= -no-strip
31CONFIGURE_ARGS+= -system-harfbuzz 31CONFIGURE_ARGS+= -system-harfbuzz
32CONFIGURE_ARGS+= -system-libjpeg 32CONFIGURE_ARGS+= -system-libjpeg
33CONFIGURE_ARGS+= -system-libpng 33CONFIGURE_ARGS+= -system-libpng
34CONFIGURE_ARGS+= -system-pcre 34CONFIGURE_ARGS+= -system-pcre
35CONFIGURE_ARGS+= -system-sqlite 35CONFIGURE_ARGS+= -system-sqlite
36CONFIGURE_ARGS+= -system-zlib 36CONFIGURE_ARGS+= -system-zlib
37OPSYSVARS+= CONFIGURE_ARGS 37OPSYSVARS+= CONFIGURE_ARGS
38 38
39.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
40 40
41.if ${OPSYS} != "Darwin" 41.if ${OPSYS} != "Darwin"
42CONFIGURE_ARGS+= -iconv 42CONFIGURE_ARGS+= -iconv
43QMAKE_CONF= qmake.conf 43QMAKE_CONF= qmake.conf
44. if ${OPSYS} != "SunOS" 44. if ${OPSYS} != "SunOS" && \
 45 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
45CONFIGURE_ARGS+= -reduce-relocations 46CONFIGURE_ARGS+= -reduce-relocations
46. endif 47. endif
47.else 48.else
48QMAKE_CONF= qmake.conf.mac 49QMAKE_CONF= qmake.conf.mac
49.endif 50.endif
50 51
51.include "../../mk/compiler.mk" 52.include "../../mk/compiler.mk"
52 53
53.if ${OPSYS} == "SunOS" 54.if ${OPSYS} == "SunOS"
54. if !empty(CC_VERSION:Mgcc*) 55. if !empty(CC_VERSION:Mgcc*)
55. if ${ABI:U} == "64" 56. if ${ABI:U} == "64"
56CONFIGURE_ARGS+= -platform solaris-g++-64 57CONFIGURE_ARGS+= -platform solaris-g++-64
57. else 58. else