Wed Apr 26 06:12:25 2017 UTC ()
Compile with -std=c++11. Needed for compiling with icu;
set for all qt5 packages for consistency.


(wiz)
diff -r1.19 -r1.20 pkgsrc/x11/qt5-qtbase/Makefile.common
cvs diff -r1.19 -r1.20 pkgsrc/x11/qt5-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile.common 2016/02/26 11:27:16 1.19
+++ pkgsrc/x11/qt5-qtbase/Makefile.common 2017/04/26 06:12:25 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2016/02/26 11:27:16 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.20 2017/04/26 06:12:25 wiz Exp $
2# used by x11/qt5-mysql/Makefile 2# used by x11/qt5-mysql/Makefile
3# used by x11/qt5-odbc/Makefile 3# used by x11/qt5-odbc/Makefile
4# used by x11/qt5-psql/Makefile 4# used by x11/qt5-psql/Makefile
5# used by x11/qt5-qtbase/Makefile 5# used by x11/qt5-qtbase/Makefile
6# used by x11/qt5-qtdeclarative/Makefile 6# used by x11/qt5-qtdeclarative/Makefile
7# used by x11/qt5-qtdoc/Makefile 7# used by x11/qt5-qtdoc/Makefile
8# used by x11/qt5-qtgraphicaleffects/Makefile 8# used by x11/qt5-qtgraphicaleffects/Makefile
9# used by x11/qt5-qtimageformats/Makefile 9# used by x11/qt5-qtimageformats/Makefile
10# used by x11/qt5-qtlocation/Makefile 10# used by x11/qt5-qtlocation/Makefile
11# used by x11/qt5-qtmacextras/Makefile 11# used by x11/qt5-qtmacextras/Makefile
12# used by x11/qt5-qtmultimedia/Makefile 12# used by x11/qt5-qtmultimedia/Makefile
13# used by x11/qt5-qtquick1/Makefile 13# used by x11/qt5-qtquick1/Makefile
14# used by x11/qt5-qtquickcontrols/Makefile 14# used by x11/qt5-qtquickcontrols/Makefile
@@ -22,26 +22,27 @@ @@ -22,26 +22,27 @@
22# used by x11/qt5-qtwebkit/Makefile 22# used by x11/qt5-qtwebkit/Makefile
23# used by x11/qt5-qtwebsockets/Makefile 23# used by x11/qt5-qtwebsockets/Makefile
24# used by x11/qt5-qtx11extras/Makefile 24# used by x11/qt5-qtx11extras/Makefile
25# used by x11/qt5-qtxmlpatterns/Makefile 25# used by x11/qt5-qtxmlpatterns/Makefile
26# used by x11/qt5-sqlite3/Makefile 26# used by x11/qt5-sqlite3/Makefile
27 27
28.include "../../x11/qt5/Makefile.common" 28.include "../../x11/qt5/Makefile.common"
29.include "options.mk" 29.include "options.mk"
30 30
31.include "../../mk/dlopen.buildlink3.mk" 31.include "../../mk/dlopen.buildlink3.mk"
32BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 32BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
33 33
34USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
 35CXXFLAGS+= -std=c++11
35USE_LIBTOOL= yes 36USE_LIBTOOL= yes
36USE_TOOLS+= gmake perl:build pkg-config 37USE_TOOLS+= gmake perl:build pkg-config
37 38
38# wcstof(3) etc. is used in C++ code. 39# wcstof(3) etc. is used in C++ code.
39CFLAGS.NetBSD+= -D_NETBSD_SOURCE 40CFLAGS.NetBSD+= -D_NETBSD_SOURCE
40 41
41# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 42# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
42BUILDLINK_TRANSFORM+= rm:-Wundef 43BUILDLINK_TRANSFORM+= rm:-Wundef
43 44
44# SunOS ld doesn't support -rpath-link 45# SunOS ld doesn't support -rpath-link
45BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib 46BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
46BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib 47BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib
47 48