/[gentoo-x86]/eclass/qt4-build.eclass
Gentoo

Diff of /eclass/qt4-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.106 Revision 1.121
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.106 2011/12/21 22:47:35 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
44 !>x11-libs/qt-gui-${PV}-r9999 44 !>x11-libs/qt-gui-${PV}-r9999
45 !<x11-libs/qt-multimedia-${PV} 45 !<x11-libs/qt-multimedia-${PV}
46 !>x11-libs/qt-multimedia-${PV}-r9999 46 !>x11-libs/qt-multimedia-${PV}-r9999
47 !<x11-libs/qt-opengl-${PV} 47 !<x11-libs/qt-opengl-${PV}
48 !>x11-libs/qt-opengl-${PV}-r9999 48 !>x11-libs/qt-opengl-${PV}-r9999
49 !<x11-libs/qt-openvg-${PV}
50 !>x11-libs/qt-openvg-${PV}-r9999
49 !<x11-libs/qt-phonon-${PV} 51 !<x11-libs/qt-phonon-${PV}
50 !>x11-libs/qt-phonon-${PV}-r9999 52 !>x11-libs/qt-phonon-${PV}-r9999
51 !<x11-libs/qt-qt3support-${PV} 53 !<x11-libs/qt-qt3support-${PV}
52 !>x11-libs/qt-qt3support-${PV}-r9999 54 !>x11-libs/qt-qt3support-${PV}-r9999
53 !<x11-libs/qt-script-${PV} 55 !<x11-libs/qt-script-${PV}
66 68
67S=${WORKDIR}/${MY_P} 69S=${WORKDIR}/${MY_P}
68 70
69# @FUNCTION: qt4-build_pkg_setup 71# @FUNCTION: qt4-build_pkg_setup
70# @DESCRIPTION: 72# @DESCRIPTION:
71# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH 73# Sets up PATH and LD_LIBRARY_PATH.
72qt4-build_pkg_setup() { 74qt4-build_pkg_setup() {
73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 75 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
74 76
75 # Protect users by not allowing downgrades between releases 77 # Protect users by not allowing downgrades between releases
76 # Downgrading revisions within the same release should be allowed 78 # Downgrading revisions within the same release should be allowed
109 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 111 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
110 ${QT4_EXTRACT_DIRECTORIES}" 112 ${QT4_EXTRACT_DIRECTORIES}"
111 fi 113 fi
112 114
113 # Make sure ebuilds use the required EAPI 115 # Make sure ebuilds use the required EAPI
114 if [[ ${EAPI} != [23] ]]; then 116 if [[ ${EAPI} != [234] ]]; then
115 eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using" 117 eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
116 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be" 118 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
117 eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail." 119 eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
118 die "qt4-build eclass requires EAPI=2 or EAPI=3" 120 die "qt4-build eclass requires EAPI 2,3 or 4"
119 fi 121 fi
120 122
121 if ! version_is_at_least 4.1 $(gcc-version); then 123 if ! version_is_at_least 4.1 $(gcc-version); then
122 ewarn "Using a GCC version lower than 4.1 is not supported!" 124 ewarn "Using a GCC version lower than 4.1 is not supported!"
123 fi 125 fi
124} 126}
125 127
126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 128# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
127# @DESCRIPTION: 129# @DESCRIPTION:
128# Arguments for build_target_directories. Takes the directories, in which the 130# Arguments for build_target_directories. Takes the directories in which the
129# code should be compiled. This is a space-separated list 131# code should be compiled. This is a space-separated list.
130 132
131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES 133# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
132# @DESCRIPTION: 134# @DESCRIPTION:
133# Space separated list including the directories that will be extracted from Qt 135# Space-separated list including the directories that will be extracted from
134# tarball 136# Qt tarball.
135 137
136# @FUNCTION: qt4-build_src_unpack 138# @FUNCTION: qt4-build_src_unpack
137# @DESCRIPTION: 139# @DESCRIPTION:
138# Unpacks the sources 140# Unpacks the sources.
139qt4-build_src_unpack() { 141qt4-build_src_unpack() {
140 setqtenv 142 setqtenv
141 local unpack_p="${MY_P}" 143
142 case "${PV}" in 144 local tarball="${MY_P}.tar.gz" target= targets=
143 4.8.0_*)
144 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
145 ;;
146 esac
147 local target targets=
148 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 145 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
149 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 146 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
150 ${QT4_EXTRACT_DIRECTORIES}; do 147 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
148 do
151 targets+=" ${unpack_p}/${target}" 149 targets+="${MY_P}/${target} "
152 done 150 done
153 151
152 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
154 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 153 tar -xzf "${DISTDIR}/${tarball}" ${targets}
155 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 154 eend $? || die "failed to unpack"
156 case "${PV}" in
157 4.8.0_*)
158 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
159 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
160 ;;
161 esac
162} 155}
163 156
164# @ECLASS-VARIABLE: PATCHES 157# @ECLASS-VARIABLE: PATCHES
158# @DEFAULT_UNSET
165# @DESCRIPTION: 159# @DESCRIPTION:
166# In case you have patches to apply, specify them in PATCHES variable. Make sure 160# PATCHES array variable containing all various patches to be applied.
167# to specify the full path. This variable is necessary for src_prepare phase. 161# This variable is expected to be defined in global scope of ebuild.
168# example: 162# Make sure to specify the full path. This variable is utilised in
169# PATCHES="${FILESDIR}"/mypatch.patch 163# src_unpack/src_prepare phase, based on EAPI.
170# ${FILESDIR}"/mypatch2.patch"
171# 164#
165# @CODE
166# PATCHES=( "${FILESDIR}/mypatch.patch"
167# "${FILESDIR}/patches_folder/" )
168# @CODE
172 169
173# @FUNCTION: qt4-build_src_prepare 170# @FUNCTION: qt4-build_src_prepare
174# @DESCRIPTION: 171# @DESCRIPTION:
175# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 172# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
176# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 173# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
177qt4-build_src_prepare() { 174qt4-build_src_prepare() {
178 setqtenv 175 setqtenv
179 cd "${S}" 176 cd "${S}"
180
181 # fix qt 4.7 regression that skips -fvisibility=hidden
182 if version_is_at_least "4.7.0_beta1"; then
183 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
184 -i config.tests/unix/fvisibility.test ||
185 die "visibility fixing sed failed"
186 fi
187 177
188 if version_is_at_least "4.7"; then 178 if version_is_at_least "4.7"; then
189 # fix libX11 dependency on non X packages 179 # fix libX11 dependency on non X packages
190 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 180 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
191 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 181 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
197 # provide a proper macx-g++-64 187 # provide a proper macx-g++-64
198 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 188 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
199 189
200 sed -e '/^CONFIG/s:app_bundle::' \ 190 sed -e '/^CONFIG/s:app_bundle::' \
201 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 191 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
202 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 192 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
203 fi 193 fi
204 194
205 if [[ ${PN} != qt-core ]]; then 195 if [[ ${PN} != qt-core ]]; then
206 skip_qmake_build 196 skip_qmake_build
207 skip_project_generation 197 skip_project_generation
208 symlink_binaries_to_buildtree 198 symlink_binaries_to_buildtree
209 fi 199 fi
210 200
211 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 201 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
212 # qmake bus errors with -O2 but -O3 works 202 # qmake bus errors with -O2 but -O3 works
213 replace-flags -O2 -O3 203 replace-flags -O2 -O3
214 fi 204 fi
215 205
216 # Bug 178652 206 # Bug 178652
227 ewarn "disabled." 217 ewarn "disabled."
228 append-flags -std=c++0x 218 append-flags -std=c++0x
229 fi 219 fi
230 220
231 # Unsupported old gcc versions - hardened needs this :( 221 # Unsupported old gcc versions - hardened needs this :(
232 if [[ $(gcc-major-version) -lt 4 ]] ; then 222 if [[ $(gcc-major-version) -lt 4 ]]; then
233 ewarn "Appending -fno-stack-protector to CXXFLAGS" 223 ewarn "Appending -fno-stack-protector to CXXFLAGS"
234 append-cxxflags -fno-stack-protector 224 append-cxxflags -fno-stack-protector
235 # Bug 253127 225 # Bug 253127
236 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 226 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
237 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 227 -i mkspecs/common/g++.conf || die
238 fi 228 fi
239 229
240 # Bug 261632 230 # Bug 261632
241 if use ppc64; then 231 if use ppc64; then
242 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 232 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
243 append-flags -mminimal-toc 233 append-flags -mminimal-toc
244 fi 234 fi
245 235
246 # Bug 282984 && Bug 295530 236 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
247 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 237 sed -e "/^SYSTEM_VARIABLES=/i \
248 -i configure || die "sed qmake compilers failed" 238 CC='$(tc-getCC)'\n\
239 CXX='$(tc-getCXX)'\n\
240 CFLAGS='${CFLAGS}'\n\
241 CXXFLAGS='${CXXFLAGS}'\n\
242 LDFLAGS='${LDFLAGS}'\n" \
243 -i configure \
244 || die "sed SYSTEM_VARIABLES failed"
249 245
250 # Bug 321335 246 # Respect CC, CXX, LINK and *FLAGS in config.tests
251 if version_is_at_least 4.6; then 247 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
252 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 248 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
253 xargs -0 \ 249 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
254 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ 250 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
255 -i || die "sed test compilers failed" 251 || die "sed config.tests failed"
256 fi 252
253 # Strip predefined CFLAGS from mkspecs (bug 312689)
254 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
257 255
258 # Bug 172219 256 # Bug 172219
259 sed -e "s:X11R6/::" \ 257 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
260 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
261 258
262 if [[ ${CHOST} == *-darwin* ]]; then 259 if [[ ${CHOST} == *-darwin* ]]; then
263 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 260 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
264 # crippled (by design) :/ 261 # crippled (by design) :/
262 sed \
265 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 263 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
266 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 264 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
267 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ 265 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
268 -e "s:-arch\s\w*::g" \ 266 -e "s:-arch\s\w*::g" \
269 -i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed" 267 -i mkspecs/common/mac-g++.conf \
268 || die "sed mkspecs/common/mac-g++.conf failed"
270 269
271 # Fix configure's -arch settings that appear in qmake/Makefile and also 270 # Fix configure's -arch settings that appear in qmake/Makefile and also
272 # fix arch handling (automagically duplicates our -arch arg and breaks 271 # fix arch handling (automagically duplicates our -arch arg and breaks
273 # pch). Additionally disable Xarch support. 272 # pch). Additionally disable Xarch support.
274 sed \ 273 sed \
279 -e "s:-arch \$i::" \ 278 -e "s:-arch \$i::" \
280 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 279 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
281 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 280 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
282 -e "s:-Xarch_x86_64::g" \ 281 -e "s:-Xarch_x86_64::g" \
283 -e "s:-Xarch_ppc64::g" \ 282 -e "s:-Xarch_ppc64::g" \
284 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 283 -i configure mkspecs/common/mac-g++.conf \
284 || die "sed -arch/-Xarch failed"
285 285
286 # On Snow Leopard don't fall back to 10.5 deployment target. 286 # On Snow Leopard don't fall back to 10.5 deployment target.
287 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 287 if [[ ${CHOST} == *-apple-darwin10 ]]; then
288 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 288 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
289 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 289 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
290 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 290 -i configure mkspecs/common/mac-g++.conf \
291 || die "sed deployment target failed"
291 fi 292 fi
292 fi 293 fi
293 294
294 # this one is needed for all systems with a separate -liconv, apart from 295 # this one is needed for all systems with a separate -liconv, apart from
295 # Darwin, for which the sources already cater for -liconv 296 # Darwin, for which the sources already cater for -liconv
296 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then 297 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
297 sed \ 298 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
298 -e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
299 -i config.tests/unix/iconv/iconv.pro \ 299 -i config.tests/unix/iconv/iconv.pro \
300 || die "sed on iconv.pro failed" 300 || die "sed iconv.pro failed"
301 fi 301 fi
302 302
303 # we need some patches for Solaris 303 # we need some patches for Solaris
304 sed -i \
305 -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ 304 sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
306 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 305 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
307 # use GCC over SunStudio 306 # use GCC over SunStudio
308 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 307 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
309 # don't flirt with non-Prefix stuff, we're quite possessive 308 # do not flirt with non-Prefix stuff, we're quite possessive
310 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 309 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
311 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 310 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
312 # strip predefined CFLAGS from qmake ( bug #312689 )
313 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
314 311
315 base_src_prepare 312 base_src_prepare
316} 313}
317 314
318# @FUNCTION: qt4-build_src_configure 315# @FUNCTION: qt4-build_src_configure
319# @DESCRIPTION: 316# @DESCRIPTION:
320# Default configure phase 317# Default configure phase
321qt4-build_src_configure() { 318qt4-build_src_configure() {
322 setqtenv 319 setqtenv
323 myconf="$(standard_configure_options) ${myconf}" 320
321 local conf="
322 -prefix ${QTPREFIXDIR}
323 -bindir ${QTBINDIR}
324 -libdir ${QTLIBDIR}
325 -docdir ${QTDOCDIR}
326 -headerdir ${QTHEADERDIR}
327 -plugindir ${QTPLUGINDIR}
328 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
329 -datadir ${QTDATADIR}
330 -translationdir ${QTTRANSDIR}
331 -sysconfdir ${QTSYSCONFDIR}
332 -examplesdir ${QTEXAMPLESDIR}
333 -demosdir ${QTDEMOSDIR}
334 -opensource -confirm-license
335 -shared -fast -largefile -stl -verbose
336 -nomake examples -nomake demos"
337
338 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
339 # $(tc-arch). Therefore we convert it to supported values.
340 case "$(tc-arch)" in
341 amd64|x64-*) conf+=" -arch x86_64" ;;
342 ppc-macos) conf+=" -arch ppc" ;;
343 ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;;
344 sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;;
345 x86-macos) conf+=" -arch x86" ;;
346 x86|x86-*) conf+=" -arch i386" ;;
347 alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
348 hppa|sh) conf+=" -arch generic" ;;
349 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
350 esac
351
352 conf+=" -platform $(qt_mkspecs_dir)"
353
354 [[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
355
356 # debug/release
357 if use debug; then
358 conf+=" -debug"
359 else
360 conf+=" -release"
361 fi
362 conf+=" -no-separate-debug-info"
363
364 # exceptions USE flag
365 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
366
367 # disable RPATH on Qt >= 4.8 (bug 380415)
368 version_is_at_least 4.8 && conf+=" -no-rpath"
369
370 # precompiled headers don't work on hardened, where the flag is masked
371 conf+=" $(qt_use pch)"
372
373 # -reduce-relocations
374 # This flag seems to introduce major breakage to applications,
375 # mostly to be seen as a core dump with the message "QPixmap: Must
376 # construct a QApplication before a QPaintDevice" on Solaris.
377 # -- Daniel Vergien
378 [[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
324 379
325 # this one is needed for all systems with a separate -liconv, apart from 380 # this one is needed for all systems with a separate -liconv, apart from
326 # Darwin, for which the sources already cater for -liconv 381 # Darwin, for which the sources already cater for -liconv
327 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 382 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
328 myconf+=" -liconv" 383 conf+=" -liconv"
384 fi
329 385
330 if use_if_iuse glib; then 386 if use_if_iuse glib; then
331 # use -I, -L and -l from configure
332 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 387 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
333 # avoid the -pthread argument 388 # avoid the -pthread argument
334 myconf+=" ${glibflags//-pthread}" 389 conf+=" ${glibflags//-pthread}"
335 unset glibflags 390 unset glibflags
336 fi 391 fi
337 392
338 if use_if_iuse qpa; then 393 if use_if_iuse qpa; then
339 ewarn 394 ewarn
340 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" 395 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
341 ewarn "known as Qt Lighthouse. If you are not sure what that is, then" 396 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
342 ewarn "disable it before reporting any bugs related to this useflag." 397 ewarn "disable it before reporting any bugs related to this useflag."
343 ewarn 398 ewarn
344 myconf+=" -qpa" 399 conf+=" -qpa"
345 fi 400 fi
346 401
347 if use aqua ; then 402 if use aqua; then
348 # On (snow) leopard use the new (frameworked) cocoa code. 403 # On (snow) leopard use the new (frameworked) cocoa code.
349 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 404 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
350 myconf+=" -cocoa -framework" 405 conf+=" -cocoa -framework"
406 # We need the source's headers, not the installed ones.
407 conf+=" -I${S}/include"
408 # Add hint for the framework location.
409 conf+=" -F${QTLIBDIR}"
351 410
352 # We are crazy and build cocoa + qt3support :-) 411 # We are crazy and build cocoa + qt3support :-)
353 if use qt3support; then 412 if use qt3support; then
354 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ 413 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
355 -i configure 414 -i configure || die
356 fi 415 fi
357 416 else
358 # We need the source's headers, not the installed ones. 417 conf+=" -no-framework"
359 myconf+=" -I${S}/include"
360
361 # Add hint for the framework location.
362 myconf+=" -F${QTLIBDIR}"
363 fi 418 fi
364 else 419 else
365 # freetype2 include dir is non-standard, thus include it on configure 420 # freetype2 include dir is non-standard, thus pass it to configure
366 # use -I from configure
367 myconf+=" $(pkg-config --cflags freetype2)" 421 conf+=" $(pkg-config --cflags-only-I freetype2)"
368 fi 422 fi
369 423
424 conf+=" ${myconf}"
425 myconf=
426
370 echo ./configure ${myconf} 427 echo ./configure ${conf}
371 ./configure ${myconf} || die "./configure failed" 428 ./configure ${conf} || die "./configure failed"
372 myconf=""
373 429
374 prepare_directories ${QT4_TARGET_DIRECTORIES} 430 prepare_directories ${QT4_TARGET_DIRECTORIES}
375} 431}
376 432
377# @FUNCTION: qt4-build_src_compile 433# @FUNCTION: qt4-build_src_compile
385 441
386# @FUNCTION: qt4-build_src_test 442# @FUNCTION: qt4-build_src_test
387# @DESCRIPTION: 443# @DESCRIPTION:
388# Runs tests only in target directories. 444# Runs tests only in target directories.
389qt4-build_src_test() { 445qt4-build_src_test() {
446 # QtMultimedia does not have any test suite (bug #332299)
447 [[ ${PN} == "qt-multimedia" ]] && return
448
390 for dir in ${QT4_TARGET_DIRECTORIES}; do 449 for dir in ${QT4_TARGET_DIRECTORIES}; do
391 emake -j1 check -C ${dir} 450 emake -j1 check -C ${dir}
392 done 451 done
393} 452}
394 453
395# @FUNCTION: fix_includes 454# @FUNCTION: fix_includes
396# @DESCRIPTION: 455# @DESCRIPTION:
397# For MacOSX we need to add some symlinks when frameworks are 456# For MacOS X we need to add some symlinks when frameworks are
398# being used, to avoid complications with some more or less stupid packages. 457# being used, to avoid complications with some more or less stupid packages.
399fix_includes() { 458fix_includes() {
400 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 459 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
401 # Some packages tend to include <Qt/...> 460 # Some packages tend to include <Qt/...>
402 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 461 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
403 462
404 # Fake normal headers when frameworks are installed... eases life later on 463 # Fake normal headers when frameworks are installed... eases life later on
405 local dest f 464 local dest f h
406 for frw in "${D}${QTLIBDIR}"/*.framework; do 465 for frw in "${D}${QTLIBDIR}"/*.framework; do
407 [[ -e "${frw}"/Headers ]] || continue 466 [[ -e "${frw}"/Headers ]] || continue
408 f=$(basename ${frw}) 467 f=$(basename ${frw})
409 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 468 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
410 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 469 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
429 install_qconfigs 488 install_qconfigs
430 fix_library_files 489 fix_library_files
431 fix_includes 490 fix_includes
432 491
433 # remove .la files since we are building only shared Qt libraries 492 # remove .la files since we are building only shared Qt libraries
434 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 493 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
435} 494}
436 495
437# @FUNCTION: setqtenv 496# @FUNCTION: setqtenv
497# @INTERNAL
438setqtenv() { 498setqtenv() {
439 # Set up installation directories 499 # Set up installation directories
440 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
441 QTPREFIXDIR=${EPREFIX}/usr 500 QTPREFIXDIR=${EPREFIX}/usr
442 QTBINDIR=${EPREFIX}/usr/bin 501 QTBINDIR=${EPREFIX}/usr/bin
443 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 502 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
444 QMAKE_LIBDIR_QT=${QTLIBDIR}
445 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 503 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
446 QTDATADIR=${EPREFIX}/usr/share/qt4
447 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 504 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
448 QTHEADERDIR=${EPREFIX}/usr/include/qt4 505 QTHEADERDIR=${EPREFIX}/usr/include/qt4
449 QTPLUGINDIR=${QTLIBDIR}/plugins 506 QTPLUGINDIR=${QTLIBDIR}/plugins
450 QTIMPORTDIR=${QTLIBDIR}/imports 507 QTIMPORTDIR=${QTLIBDIR}/imports
508 QTDATADIR=${EPREFIX}/usr/share/qt4
509 QTTRANSDIR=${QTDATADIR}/translations
451 QTSYSCONFDIR=${EPREFIX}/etc/qt4 510 QTSYSCONFDIR=${EPREFIX}/etc/qt4
452 QTTRANSDIR=${QTDATADIR}/translations
453 QTEXAMPLESDIR=${QTDATADIR}/examples 511 QTEXAMPLESDIR=${QTDATADIR}/examples
454 QTDEMOSDIR=${QTDATADIR}/demos 512 QTDEMOSDIR=${QTDATADIR}/demos
513 QMAKE_LIBDIR_QT=${QTLIBDIR}
455 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 514 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
515
456 PLATFORM=$(qt_mkspecs_dir) 516 PLATFORM=$(qt_mkspecs_dir)
457 517
458 unset QMAKESPEC 518 unset QMAKESPEC
459}
460
461# @FUNCTION: standard_configure_options
462# @DESCRIPTION:
463# Sets up some standard configure options, like libdir (if necessary), whether
464# debug info is wanted or not.
465standard_configure_options() {
466 local myconf=
467
468 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
469
470 # Disable visibility explicitly if gcc version isn't 4
471 if [[ $(gcc-major-version) -lt 4 ]]; then
472 myconf+=" -no-reduce-exports"
473 fi
474
475 # precompiled headers doesn't work on hardened, where the flag is masked.
476 myconf+=" $(qt_use pch)"
477
478 if use debug; then
479 myconf+=" -debug"
480 else
481 myconf+=" -release"
482 fi
483 myconf+=" -no-separate-debug-info"
484
485 use aqua && myconf+=" -no-framework"
486
487 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
488 # $(tc-arch). Therefore we convert it to supported values.
489 case "$(tc-arch)" in
490 amd64|x64-*) myconf+=" -arch x86_64" ;;
491 ppc-macos) myconf+=" -arch ppc" ;;
492 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
493 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
494 x86-macos) myconf+=" -arch x86" ;;
495 x86|x86-*) myconf+=" -arch i386" ;;
496 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
497 hppa|sh) myconf+=" -arch generic" ;;
498 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
499 esac
500
501 # exceptions USE flag
502 local exceptions="-exceptions"
503 in_iuse exceptions && exceptions="$(qt_use exceptions)"
504
505 # bug 380415
506 version_is_at_least 4.8 && myconf+=" -no-rpath"
507
508 # note about -reduce-relocations:
509 # That flag seems to introduce major breakage to applications,
510 # mostly to be seen as a core dump with the message "QPixmap: Must
511 # construct a QApplication before a QPaintDevice" on Solaris
512 # -- Daniel Vergien
513 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
514
515 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
516 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
517 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
518 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
519 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
520 -demosdir ${QTDEMOSDIR} -importdir ${QTIMPORTDIR} -silent -fast -opensource
521 ${exceptions}
522 -nomake examples -nomake demos"
523
524 echo "${myconf}"
525} 519}
526 520
527# @FUNCTION: prepare_directories 521# @FUNCTION: prepare_directories
528# @USAGE: < directories > 522# @USAGE: < directories >
523# @INTERNAL
529# @DESCRIPTION: 524# @DESCRIPTION:
530# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 525# Generates Makefiles for the given list of directories.
531prepare_directories() { 526prepare_directories() {
532 for x in "$@"; do 527 for x in "$@"; do
533 pushd "${S}"/${x} >/dev/null 528 pushd "${S}"/${x} >/dev/null || die
534 einfo "Running qmake in: ${x}" 529 einfo "Running qmake in: ${x}"
535 # avoid running over the maximum argument number, bug #299810 530 # avoid running over the maximum argument number, bug #299810
536 { 531 {
537 echo "${S}"/mkspecs/common/*.conf 532 echo "${S}"/mkspecs/common/*.conf
538 find "${S}" -name '*.pr[io]' 533 find "${S}" -name '*.pr[io]'
539 } | xargs sed -i \ 534 } | xargs sed -i \
540 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \ 535 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
541 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \ 536 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
542 || die 537 || die
543 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 538 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
544 popd >/dev/null 539 popd >/dev/null || die
545 done 540 done
546} 541}
547 542
548 543
549# @FUNCTION: build_directories 544# @FUNCTION: build_directories
550# @USAGE: < directories > 545# @USAGE: < directories >
546# @INTERNAL
551# @DESCRIPTION: 547# @DESCRIPTION:
552# Compiles the code in $QT4_TARGET_DIRECTORIES 548# Compiles the code in the given list of directories.
553build_directories() { 549build_directories() {
554 for x in "$@"; do 550 for x in "$@"; do
555 pushd "${S}"/${x} >/dev/null 551 pushd "${S}"/${x} >/dev/null || die
556 emake CC="$(tc-getCC)" \ 552 emake CC="$(tc-getCC)" \
557 CXX="$(tc-getCXX)" \ 553 CXX="$(tc-getCXX)" \
558 LINK="$(tc-getCXX)" || die "emake failed" 554 LINK="$(tc-getCXX)" || die "emake failed"
559 popd >/dev/null 555 popd >/dev/null || die
560 done 556 done
561} 557}
562 558
563# @FUNCTION: install_directories 559# @FUNCTION: install_directories
564# @USAGE: < directories > 560# @USAGE: < directories >
561# @INTERNAL
565# @DESCRIPTION: 562# @DESCRIPTION:
566# run emake install in the given directories, which are separated by spaces 563# Runs emake install in the given directories, which are separated by spaces.
567install_directories() { 564install_directories() {
568 for x in "$@"; do 565 for x in "$@"; do
569 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 566 pushd "${S}"/${x} >/dev/null || die
570 emake INSTALL_ROOT="${D}" install || die "emake install failed" 567 emake INSTALL_ROOT="${D}" install || die "emake install failed"
571 popd >/dev/null || die "Can't popd from ${S}/${x}" 568 popd >/dev/null || die
572 done 569 done
573} 570}
574 571
575# @ECLASS-VARIABLE: QCONFIG_ADD 572# @ECLASS-VARIABLE: QCONFIG_ADD
576# @DESCRIPTION: 573# @DESCRIPTION:
586# @DESCRIPTION: 583# @DESCRIPTION:
587# List variables that should be defined at the top of QtCore/qconfig.h 584# List variables that should be defined at the top of QtCore/qconfig.h
588: ${QCONFIG_DEFINE:=} 585: ${QCONFIG_DEFINE:=}
589 586
590# @FUNCTION: install_qconfigs 587# @FUNCTION: install_qconfigs
588# @INTERNAL
591# @DESCRIPTION: 589# @DESCRIPTION:
592# Install gentoo-specific mkspecs configurations 590# Install gentoo-specific mkspecs configurations.
593install_qconfigs() { 591install_qconfigs() {
594 local x 592 local x
595 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 593 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
596 for x in QCONFIG_ADD QCONFIG_REMOVE; do 594 for x in QCONFIG_ADD QCONFIG_REMOVE; do
597 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 595 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
608 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 606 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
609 fi 607 fi
610} 608}
611 609
612# @FUNCTION: generate_qconfigs 610# @FUNCTION: generate_qconfigs
611# @INTERNAL
613# @DESCRIPTION: 612# @DESCRIPTION:
614# Generates gentoo-specific configurations 613# Generates gentoo-specific qconfig.{h,pri}.
615generate_qconfigs() { 614generate_qconfigs() {
616 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 615 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
617 local x qconfig_add qconfig_remove qconfig_new 616 local x qconfig_add qconfig_remove qconfig_new
618 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 617 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
619 [[ -f ${x} ]] || continue 618 [[ -f ${x} ]] || continue
668 fi 667 fi
669} 668}
670 669
671# @FUNCTION: qt4-build_pkg_postrm 670# @FUNCTION: qt4-build_pkg_postrm
672# @DESCRIPTION: 671# @DESCRIPTION:
673# Generate configurations when the package is completely removed 672# Regenerate configuration when the package is completely removed.
674qt4-build_pkg_postrm() { 673qt4-build_pkg_postrm() {
675 generate_qconfigs 674 generate_qconfigs
676} 675}
677 676
678# @FUNCTION: qt4-build_pkg_postinst 677# @FUNCTION: qt4-build_pkg_postinst
679# @DESCRIPTION: 678# @DESCRIPTION:
680# Generate configuration, plus throws a message about possible 679# Regenerate configuration, plus throw a message about possible
681# breakages and proposed solutions. 680# breakages and proposed solutions.
682qt4-build_pkg_postinst() { 681qt4-build_pkg_postinst() {
683 generate_qconfigs 682 generate_qconfigs
684} 683}
685 684
686# @FUNCTION: skip_qmake_build 685# @FUNCTION: skip_qmake_build
686# @INTERNAL
687# @DESCRIPTION: 687# @DESCRIPTION:
688# Don't need to build qmake, as it's already installed from qt-core 688# Patches configure to skip qmake compilation, as it's already installed by qt-core.
689skip_qmake_build() { 689skip_qmake_build() {
690 # Don't need to build qmake, as it's already installed from qt-core
691 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed" 690 sed -i -e "s:if true:if false:g" "${S}"/configure || die
692} 691}
693 692
694# @FUNCTION: skip_project_generation 693# @FUNCTION: skip_project_generation
694# @INTERNAL
695# @DESCRIPTION: 695# @DESCRIPTION:
696# Exit the script early by throwing in an exit before all of the .pro files are scanned 696# Exit the script early by throwing in an exit before all of the .pro files are scanned.
697skip_project_generation() { 697skip_project_generation() {
698 # Exit the script early by throwing in an exit before all of the .pro files are scanned
699 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 698 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
700 -i "${S}"/configure || die "sed failed"
701} 699}
702 700
703# @FUNCTION: symlink_binaries_to_buildtree 701# @FUNCTION: symlink_binaries_to_buildtree
702# @INTERNAL
704# @DESCRIPTION: 703# @DESCRIPTION:
705# Symlink generated binaries to buildtree so they can be used during compilation 704# Symlinks generated binaries to buildtree, so they can be used during compilation time.
706# time
707symlink_binaries_to_buildtree() { 705symlink_binaries_to_buildtree() {
708 for bin in qmake moc uic rcc; do 706 for bin in qmake moc uic rcc; do
709 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed" 707 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
710 done 708 done
711} 709}
712 710
713# @FUNCTION: fix_library_files 711# @FUNCTION: fix_library_files
712# @INTERNAL
714# @DESCRIPTION: 713# @DESCRIPTION:
715# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 714# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
716# moves the *.pc-files into the pkgconfig directory 715# moves the *.pc files into the pkgconfig directory.
717fix_library_files() { 716fix_library_files() {
717 local libfile
718 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 718 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
719 if [[ -e ${libfile} ]]; then 719 if [[ -e ${libfile} ]]; then
720 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed" 720 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
721 fi 721 fi
722 done 722 done
723 723
724 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 724 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
725 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 725 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
726 if [[ -e ${libfile} ]]; then 726 if [[ -e ${libfile} ]]; then
727 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed" 727 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
728 728
729 # Move .pc files into the pkgconfig directory 729 # Move .pc files into the pkgconfig directory
730 dodir ${QTPCDIR#${EPREFIX}} 730 dodir ${QTPCDIR#${EPREFIX}}
731 mv ${libfile} "${D}"/${QTPCDIR}/ \ 731 mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
732 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
733 fi 732 fi
734 done 733 done
735 734
736 # Don't install an empty directory 735 # Don't install an empty directory
737 rmdir "${D}"/${QTLIBDIR}/pkgconfig 736 rmdir "${D}"/${QTLIBDIR}/pkgconfig
738} 737}
739 738
740# @FUNCTION: qt_use 739# @FUNCTION: qt_use
741# @USAGE: < flag > [ feature ] [ enableval ] 740# @USAGE: < flag > [ feature ] [ enableval ]
742# @DESCRIPTION: 741# @DESCRIPTION:
743# This will echo "${enableval}-${feature}" if <flag> is enabled, or 742# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
744# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 743# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
745# will be used for that. If [enableval] is not specified, it omits the 744# will be used for that. If [enableval] is not specified, it omits the
746# assignment-part 745# "-${enableval}" part.
747qt_use() { 746qt_use() {
748 local flag=$1 747 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
749 local feature=$1
750 local enableval=
751
752 [[ -n $2 ]] && feature=$2
753 [[ -n $3 ]] && enableval=-$3
754
755 if use ${flag}; then
756 echo "${enableval}-${feature}"
757 else
758 echo "-no-${feature}"
759 fi
760} 748}
761 749
762# @FUNCTION: qt_mkspecs_dir 750# @FUNCTION: qt_mkspecs_dir
763# @RETURN: the specs-directory w/o path 751# @RETURN: the specs-directory w/o path
764# @DESCRIPTION: 752# @DESCRIPTION:
765# Allows us to define which mkspecs dir we want to use. 753# Allows us to define which mkspecs dir we want to use.
766qt_mkspecs_dir() { 754qt_mkspecs_dir() {
767 # Allows us to define which mkspecs dir we want to use.
768 local spec 755 local spec=
769
770 case ${CHOST} in 756 case ${CHOST} in
771 *-freebsd*|*-dragonfly*) 757 *-freebsd*|*-dragonfly*)
772 spec=freebsd ;; 758 spec=freebsd ;;
773 *-openbsd*) 759 *-openbsd*)
774 spec=openbsd ;; 760 spec=openbsd ;;
797 elif [[ ${CXX} == *icpc* ]]; then 783 elif [[ ${CXX} == *icpc* ]]; then
798 spec+=-icc 784 spec+=-icc
799 else 785 else
800 die "Unknown compiler '${CXX}'" 786 die "Unknown compiler '${CXX}'"
801 fi 787 fi
802 if [[ -n ${LIBDIR/lib} ]]; then
803 spec+=-${LIBDIR/lib}
804 fi
805 788
806 # Add -64 for 64bit profiles 789 # Add -64 for 64bit profiles
807 if use x64-freebsd || 790 if use x64-freebsd ||
808 use amd64-linux || 791 use amd64-linux ||
809 use x64-macos || 792 use x64-macos ||
815 798
816 echo "${spec}" 799 echo "${spec}"
817} 800}
818 801
819# @FUNCTION: qt_assistant_cleanup 802# @FUNCTION: qt_assistant_cleanup
820# @RETURN: nothing 803# @INTERNAL
821# @DESCRIPTION: 804# @DESCRIPTION:
822# Tries to clean up tools.pro for qt-assistant ebuilds. 805# Tries to clean up tools.pro for qt-assistant ebuilds.
823# Meant to be called in src_prepare(). 806# Meant to be called in src_prepare().
824# Since Qt 4.7.4 this function is a no-op. 807# Since Qt 4.7.4 this function is a no-op.
825qt_assistant_cleanup() { 808qt_assistant_cleanup() {
845 ;; 828 ;;
846 esac 829 esac
847} 830}
848 831
849# @FUNCTION: qt_nolibx11 832# @FUNCTION: qt_nolibx11
850# @RETURN: nothing 833# @INTERNAL
851# @DESCRIPTION: 834# @DESCRIPTION:
852# Ignore X11 tests for packages that don't need X libraries installed 835# Ignore X11 tests for packages that don't need X libraries installed.
853qt_nolibx11() { 836qt_nolibx11() {
854 einfo "Removing X11 check to allow X-less compilation"
855 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 837 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
856 die "x11 check sed failed" 838 die "x11 check sed failed"
857} 839}
858 840
859EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 841EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.121

  ViewVC Help
Powered by ViewVC 1.1.20