Fri May 5 17:38:00 2017 UTC ()
Move C++11 setting before the first inclusion of compiler.mk. Reuse the
results instead of multiply inclusions.


(joerg)
diff -r1.116 -r1.117 pkgsrc/x11/qt4-libs/Makefile
diff -r1.41 -r1.42 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/hacks.mk
cvs diff -r1.116 -r1.117 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2017/05/03 08:38:46 1.116
+++ pkgsrc/x11/qt4-libs/Makefile 2017/05/05 17:38:00 1.117
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.116 2017/05/03 08:38:46 jperkin Exp $ 1# $NetBSD: Makefile,v 1.117 2017/05/05 17:38:00 joerg Exp $
2 2
3PKGNAME= qt4-libs-${QTVERSION} 3PKGNAME= qt4-libs-${QTVERSION}
4PKGREVISION= 6 4PKGREVISION= 6
5COMMENT= C++ X GUI toolkit 5COMMENT= C++ X GUI toolkit
6 6
7.include "../../x11/qt4-libs/Makefile.common" 7.include "../../x11/qt4-libs/Makefile.common"
8 8
9# XXX this is to test what really gets installed when 'do-install' is disabled 9# XXX this is to test what really gets installed when 'do-install' is disabled
10INSTALL_DIRS+= src 10INSTALL_DIRS+= src
11 11
12BUILD_TARGET= sub-src 12BUILD_TARGET= sub-src
13 13
14PTHREAD_OPTS+= require 14PTHREAD_OPTS+= require
@@ -18,29 +18,26 @@ BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} @@ -18,29 +18,26 @@ BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
19 19
20# built as plugins 20# built as plugins
21CONFIGURE_ARGS+= -no-dbus 21CONFIGURE_ARGS+= -no-dbus
22CONFIGURE_ARGS+= -no-libmng 22CONFIGURE_ARGS+= -no-libmng
23CONFIGURE_ARGS+= -no-libtiff 23CONFIGURE_ARGS+= -no-libtiff
24CONFIGURE_ARGS+= -no-sql-sqlite 24CONFIGURE_ARGS+= -no-sql-sqlite
25 25
26# kdelibs4 requires openssl support! 26# kdelibs4 requires openssl support!
27CONFIGURE_ARGS+= -openssl-linked 27CONFIGURE_ARGS+= -openssl-linked
28 28
29CONFIGURE_ARGS+= -iconv 29CONFIGURE_ARGS+= -iconv
30 30
31USE_LANGUAGES+= c++11 
32 
33.include "../../mk/compiler.mk" 
34.if !empty(PKGSRC_COMPILER:Mclang) 31.if !empty(PKGSRC_COMPILER:Mclang)
35CXXFLAGS+= -Wno-c++11-narrowing 32CXXFLAGS+= -Wno-c++11-narrowing
36. if empty(MACHINE_PLATFORM:MDarwin-*-*) 33. if empty(MACHINE_PLATFORM:MDarwin-*-*)
37CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1 34CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
38. endif 35. endif
39.endif 36.endif
40 37
41INSTALLATION_DIRS= lib/pkgconfig 38INSTALLATION_DIRS= lib/pkgconfig
42INSTALLATION_DIRS+= ${QTPREFIX}/bin 39INSTALLATION_DIRS+= ${QTPREFIX}/bin
43INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel 40INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel
44INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures 41INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures
45INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles 42INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles
46INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/shaders 43INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/shaders
cvs diff -r1.41 -r1.42 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2016/02/25 08:27:05 1.41
+++ pkgsrc/x11/qt4-libs/Makefile.common 2017/05/05 17:38:00 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.42 2017/05/05 17:38:00 joerg Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/ 13MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -53,26 +53,28 @@ PLIST_VARS+= mac unix @@ -53,26 +53,28 @@ PLIST_VARS+= mac unix
53.if ${OPSYS} == "Darwin" 53.if ${OPSYS} == "Darwin"
54PLIST.mac= yes 54PLIST.mac= yes
55QMAKE_CONF= qmake.conf.mac 55QMAKE_CONF= qmake.conf.mac
56QMAKE_RANLIB= ${RANLIB} 56QMAKE_RANLIB= ${RANLIB}
57.else 57.else
58PLIST.unix= yes 58PLIST.unix= yes
59QMAKE_CONF= qmake.conf 59QMAKE_CONF= qmake.conf
60QMAKE_RANLIB= ${TRUE} 60QMAKE_RANLIB= ${TRUE}
61.endif 61.endif
62 62
63# avoid creating a .qt directory in the users home directory 63# avoid creating a .qt directory in the users home directory
64SCRIPTS_ENV+= HOME=${WRKDIR} 64SCRIPTS_ENV+= HOME=${WRKDIR}
65 65
 66USE_LANGUAGES+= c++11
 67
66.include "../../mk/compiler.mk" 68.include "../../mk/compiler.mk"
67 69
68.if ${OPSYS} == "SunOS" 70.if ${OPSYS} == "SunOS"
69. if !empty(CC_VERSION:Mgcc*) 71. if !empty(CC_VERSION:Mgcc*)
70. if ${ABI:U} == "64" 72. if ${ABI:U} == "64"
71CONFIGURE_ARGS+= -platform solaris-g++-64 73CONFIGURE_ARGS+= -platform solaris-g++-64
72. else 74. else
73CONFIGURE_ARGS+= -platform solaris-g++ 75CONFIGURE_ARGS+= -platform solaris-g++
74. endif 76. endif
75. else 77. else
76. if ${ABI:U} == "64" 78. if ${ABI:U} == "64"
77CONFIGURE_ARGS+= -platform solaris-cc-64 79CONFIGURE_ARGS+= -platform solaris-cc-64
78. else 80. else
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/hacks.mk 2014/12/15 11:46:36 1.3
+++ pkgsrc/x11/qt4-libs/hacks.mk 2017/05/05 17:38:00 1.4
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: hacks.mk,v 1.3 2014/12/15 11:46:36 jperkin Exp $ 1# $NetBSD: hacks.mk,v 1.4 2017/05/05 17:38:00 joerg Exp $
2 2
3### [Wed Aug 3 12:18:16 UTC 2011 : tron] 3### [Wed Aug 3 12:18:16 UTC 2011 : tron]
4### If "qmake" is build with "-O2" or better with "g++" under Mac OS X the 4### If "qmake" is build with "-O2" or better with "g++" under Mac OS X the
5### resulting binary will crash. This fixes PR pkg/44716 by Richard Hansen. 5### resulting binary will crash. This fixes PR pkg/44716 by Richard Hansen.
6.if ${OPSYS} == "Darwin" 6.if ${OPSYS} == "Darwin"
7. include "../../mk/compiler.mk" 
8. if !empty(CC_VERSION:Mgcc*) 7. if !empty(CC_VERSION:Mgcc*)
9PKG_HACKS+= macosx-codegen 8PKG_HACKS+= macosx-codegen
10BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-O1 9BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-O1
11. endif 10. endif
12.endif 11.endif
13 12
14### [Wed Sep 19 09:24:11 UTC 2012 : apb] 13### [Wed Sep 19 09:24:11 UTC 2012 : apb]
15### g++-4.5.3 and 4.5.4 on NetBSD/i386 fails with an internal compiler error 14### g++-4.5.3 and 4.5.4 on NetBSD/i386 fails with an internal compiler error
16### when building gui/painting/qdrawhelper_mmx.cpp. 15### when building gui/painting/qdrawhelper_mmx.cpp.
17### Building with -O1 instead of -O2 seems to work around the problem. 16### Building with -O1 instead of -O2 seems to work around the problem.
18.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 17.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
19. include "../../mk/compiler.mk" 
20. if !empty(CC_VERSION:Mgcc-4.5.*) 18. if !empty(CC_VERSION:Mgcc-4.5.*)
21PKG_HACKS+= pr46978 19PKG_HACKS+= pr46978
22SUBST_CLASSES+= pr46978 20SUBST_CLASSES+= pr46978
23SUBST_STAGE.pr46978= post-configure 21SUBST_STAGE.pr46978= post-configure
24SUBST_MESSAGE.pr46978= Working around optimizer bug (NetBSD PR 46978) 22SUBST_MESSAGE.pr46978= Working around optimizer bug (NetBSD PR 46978)
25SUBST_FILES.pr46978= src/gui/Makefile 23SUBST_FILES.pr46978= src/gui/Makefile
26SUBST_SED.pr46978= -e '/^CXXFLAGS/s/-O2/-O1/' 24SUBST_SED.pr46978= -e '/^CXXFLAGS/s/-O2/-O1/'
27. endif 25. endif
28.endif 26.endif