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 (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,199 +1,200 @@ @@ -1,199 +1,200 @@
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
15CONFIGURE_ARGS+= -optimized-qmake 15CONFIGURE_ARGS+= -optimized-qmake
16CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 16CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
17CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} 17CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
18CONFIGURE_ARGS+= -opensource -confirm-license 18CONFIGURE_ARGS+= -opensource -confirm-license
19CONFIGURE_ARGS+= -accessibility 19CONFIGURE_ARGS+= -accessibility
20CONFIGURE_ARGS+= -fontconfig 20CONFIGURE_ARGS+= -fontconfig
21CONFIGURE_ARGS+= -icu 21CONFIGURE_ARGS+= -icu
22CONFIGURE_ARGS+= -openssl-linked 22CONFIGURE_ARGS+= -openssl-linked
23CONFIGURE_ARGS+= -nomake examples 23CONFIGURE_ARGS+= -nomake examples
24CONFIGURE_ARGS+= -nomake tests 24CONFIGURE_ARGS+= -nomake tests
25CONFIGURE_ARGS+= -no-dbus 25CONFIGURE_ARGS+= -no-dbus
26CONFIGURE_ARGS+= -no-pch 26CONFIGURE_ARGS+= -no-pch
27CONFIGURE_ARGS+= -no-sql-mysql 27CONFIGURE_ARGS+= -no-sql-mysql
28CONFIGURE_ARGS+= -no-sql-psql 28CONFIGURE_ARGS+= -no-sql-psql
29CONFIGURE_ARGS+= -no-sql-sqlite 29CONFIGURE_ARGS+= -no-sql-sqlite
30CONFIGURE_ARGS+= -no-strip 30CONFIGURE_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
58CONFIGURE_ARGS+= -platform solaris-g++ 59CONFIGURE_ARGS+= -platform solaris-g++
59. endif 60. endif
60. else 61. else
61. if ${ABI:U} == "64" 62. if ${ABI:U} == "64"
62CONFIGURE_ARGS+= -platform solaris-cc-64 63CONFIGURE_ARGS+= -platform solaris-cc-64
63. else 64. else
64CONFIGURE_ARGS+= -platform solaris-cc 65CONFIGURE_ARGS+= -platform solaris-cc
65. endif 66. endif
66. endif 67. endif
67SYS_LIBS= -lresolv -lsocket -lnsl -lrt 68SYS_LIBS= -lresolv -lsocket -lnsl -lrt
68.elif ${OPSYS} == "Interix" 69.elif ${OPSYS} == "Interix"
69CONFIGURE_ARGS+= -platform interix-g++ 70CONFIGURE_ARGS+= -platform interix-g++
70CFLAGS+= -I/usr/local/include/bind 71CFLAGS+= -I/usr/local/include/bind
71LDFLAGS+= -L/usr/local/lib/bind -lbind 72LDFLAGS+= -L/usr/local/lib/bind -lbind
72BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 73BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
73SYS_LIBS= -lbind -ldb -ldl 74SYS_LIBS= -lbind -ldb -ldl
74.elif ${OPSYS} == "DragonFly" 75.elif ${OPSYS} == "DragonFly"
75CONFIGURE_ARGS+= -platform freebsd-g++ 76CONFIGURE_ARGS+= -platform freebsd-g++
76.elif ${OPSYS} == "Darwin" 77.elif ${OPSYS} == "Darwin"
77CONFIGURE_ARGS+= -platform macx-clang 78CONFIGURE_ARGS+= -platform macx-clang
78CONFIGURE_ARGS+= -no-framework 79CONFIGURE_ARGS+= -no-framework
79. if exists(/usr/lib/libresolv.dylib) 80. if exists(/usr/lib/libresolv.dylib)
80LDFLAGS+= -lresolv 81LDFLAGS+= -lresolv
81. endif 82. endif
82.elif ${OPSYS} == "Linux" 83.elif ${OPSYS} == "Linux"
83LDFLAGS+= -ldl 84LDFLAGS+= -ldl
84.elif ${OPSYS} == "NetBSD" 85.elif ${OPSYS} == "NetBSD"
85. if exists(/usr/lib/libexecinfo.so) 86. if exists(/usr/lib/libexecinfo.so)
86LDFLAGS+= -lexecinfo 87LDFLAGS+= -lexecinfo
87. endif 88. endif
88.endif 89.endif
89 90
90REPLACE_PERL+= bin/syncqt.pl 91REPLACE_PERL+= bin/syncqt.pl
91 92
92PTHREAD_OPTS+= require 93PTHREAD_OPTS+= require
93UNLIMIT_RESOURCES= datasize 94UNLIMIT_RESOURCES= datasize
94 95
95BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 96BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
96 97
97BUILD_TARGET= sub-src 98BUILD_TARGET= sub-src
98INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig 99INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig
99INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 100INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
100 101
101CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro 102CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro
102CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro 103CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
103CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro 104CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
104CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro 105CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
105CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro 106CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
106CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro 107CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
107CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh 108CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
108 109
109SUBST_CLASSES+= opt 110SUBST_CLASSES+= opt
110SUBST_STAGE.opt= pre-configure 111SUBST_STAGE.opt= pre-configure
111SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags. 112SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags.
112SUBST_FILES.opt= mkspecs/common/gcc-base.conf 113SUBST_FILES.opt= mkspecs/common/gcc-base.conf
113SUBST_SED.opt= -e 's,-O[23],,' 114SUBST_SED.opt= -e 's,-O[23],,'
114SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' 115SUBST_SED.opt+= -e 's,-fvisibility=hidden,,'
115 116
116BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri 117BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
117 118
118PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ 119PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
119 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \ 120 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
120 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \ 121 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \
121 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ 122 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
122 Qt5Widgets.pc Qt5Xml.pc 123 Qt5Widgets.pc Qt5Xml.pc
123 124
124pre-configure: 125pre-configure:
125 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 126 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
126 -e 's:@X11BASE@:${X11BASE}:g' \ 127 -e 's:@X11BASE@:${X11BASE}:g' \
127 -e 's:@X11PREFIX@:${X11PREFIX}:g' \ 128 -e 's:@X11PREFIX@:${X11PREFIX}:g' \
128 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 129 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
129 -e 's:@CC@:${CC:Q}:g' \ 130 -e 's:@CC@:${CC:Q}:g' \
130 -e 's:@CXX@:${CXX:Q}:g' \ 131 -e 's:@CXX@:${CXX:Q}:g' \
131 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 132 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
132 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 133 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
133 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 134 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
134 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 135 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
135 -e 's:@LEX@:${LEX}:g' \ 136 -e 's:@LEX@:${LEX}:g' \
136 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 137 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
137 -e 's:@AR@:${AR:Q}:g' \ 138 -e 's:@AR@:${AR:Q}:g' \
138 -e 's:@MKDIR@:${MKDIR}:g' \ 139 -e 's:@MKDIR@:${MKDIR}:g' \
139 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 140 -e 's:@LIBQT@:${LIBQT:Q}:g' \
140 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 141 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
141 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 142 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
142 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 143 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
143 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 144 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
144 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf 145 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
145 for dir in ${WRKSRC}/mkspecs/*; do \ 146 for dir in ${WRKSRC}/mkspecs/*; do \
146 cp ${WRKSRC}/qmake.conf $${dir}; \ 147 cp ${WRKSRC}/qmake.conf $${dir}; \
147 rm -f $${dir}/*.orig; \ 148 rm -f $${dir}/*.orig; \
148 done 149 done
149 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf 150 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
150 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig 151 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
151 152
152post-configure: 153post-configure:
153 cd ${WRKSRC} && ./bin/qmake -o Makefile 154 cd ${WRKSRC} && ./bin/qmake -o Makefile
154 155
155post-install: 156post-install:
156.for i in ${PC_FILES} 157.for i in ${PC_FILES}
157 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 158 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
158 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 159 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
159.endfor 160.endfor
160 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \ 161 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \
161 ${MAKE_PROGRAM} install_mkspecs 162 ${MAKE_PROGRAM} install_mkspecs
162# The pri file has WRKSRC in it. 163# The pri file has WRKSRC in it.
163 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \ 164 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \
164 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \ 165 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \
165 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 166 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
166 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \ 167 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
167 ${DESTDIR}${PREFIX}/${BROKEN_FILES} 168 ${DESTDIR}${PREFIX}/${BROKEN_FILES}
168 169
169.include "../../converters/libiconv/buildlink3.mk" 170.include "../../converters/libiconv/buildlink3.mk"
170.include "../../devel/gettext-lib/buildlink3.mk" 171.include "../../devel/gettext-lib/buildlink3.mk"
171.include "../../devel/glib2/buildlink3.mk" 172.include "../../devel/glib2/buildlink3.mk"
172.include "../../devel/pcre/buildlink3.mk" 173.include "../../devel/pcre/buildlink3.mk"
173.include "../../devel/zlib/buildlink3.mk" 174.include "../../devel/zlib/buildlink3.mk"
174.include "../../fonts/fontconfig/buildlink3.mk" 175.include "../../fonts/fontconfig/buildlink3.mk"
175.include "../../fonts/harfbuzz/buildlink3.mk" 176.include "../../fonts/harfbuzz/buildlink3.mk"
176.include "../../graphics/freetype2/buildlink3.mk" 177.include "../../graphics/freetype2/buildlink3.mk"
177.include "../../graphics/png/buildlink3.mk" 178.include "../../graphics/png/buildlink3.mk"
178.include "../../security/openssl/buildlink3.mk" 179.include "../../security/openssl/buildlink3.mk"
179.include "../../textproc/icu/buildlink3.mk" 180.include "../../textproc/icu/buildlink3.mk"
180.if ${OPSYS} != "Darwin" 181.if ${OPSYS} != "Darwin"
181.include "../../graphics/glu/buildlink3.mk" 182.include "../../graphics/glu/buildlink3.mk"
182.include "../../x11/libxcb/buildlink3.mk" 183.include "../../x11/libxcb/buildlink3.mk"
183.include "../../x11/xcb-util/buildlink3.mk" 184.include "../../x11/xcb-util/buildlink3.mk"
184.include "../../x11/xcb-util-image/buildlink3.mk" 185.include "../../x11/xcb-util-image/buildlink3.mk"
185.include "../../x11/xcb-util-keysyms/buildlink3.mk" 186.include "../../x11/xcb-util-keysyms/buildlink3.mk"
186.include "../../x11/xcb-util-wm/buildlink3.mk" 187.include "../../x11/xcb-util-wm/buildlink3.mk"
187.include "../../x11/libSM/buildlink3.mk" 188.include "../../x11/libSM/buildlink3.mk"
188.include "../../x11/libX11/buildlink3.mk" 189.include "../../x11/libX11/buildlink3.mk"
189.include "../../x11/libXext/buildlink3.mk" 190.include "../../x11/libXext/buildlink3.mk"
190.include "../../x11/libXcursor/buildlink3.mk" 191.include "../../x11/libXcursor/buildlink3.mk"
191.include "../../x11/libXft/buildlink3.mk" 192.include "../../x11/libXft/buildlink3.mk"
192.include "../../x11/libXmu/buildlink3.mk" 193.include "../../x11/libXmu/buildlink3.mk"
193.include "../../x11/libXrandr/buildlink3.mk" 194.include "../../x11/libXrandr/buildlink3.mk"
194.include "../../x11/libXrender/buildlink3.mk" 195.include "../../x11/libXrender/buildlink3.mk"
195.include "../../x11/libxkbcommon/buildlink3.mk" 196.include "../../x11/libxkbcommon/buildlink3.mk"
196.endif 197.endif
197.include "../../mk/jpeg.buildlink3.mk" 198.include "../../mk/jpeg.buildlink3.mk"
198.include "../../mk/pthread.buildlink3.mk" 199.include "../../mk/pthread.buildlink3.mk"
199.include "../../mk/bsd.pkg.mk" 200.include "../../mk/bsd.pkg.mk"