/[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.86 Revision 1.100
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2011 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.86 2010/11/13 20:30:26 wired Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.100 2011/11/19 20:31:12 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>, 7# Qt herd <qt@gentoo.org>
8# Markos Chandras <hwoarang@gentoo.org>,
9# Caleb Tennis <caleb@gentoo.org>
10# Alex Alexander <wired@gentoo.org>
11# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
12# @DESCRIPTION: 9# @DESCRIPTION:
13# This eclass contains various functions that are used when building Qt4 10# This eclass contains various functions that are used when building Qt4.
14 11
15inherit base eutils multilib toolchain-funcs flag-o-matic versionator 12inherit base eutils multilib toolchain-funcs flag-o-matic versionator
16 13
17MY_PV=${PV/_/-} 14MY_PV=${PV/_/-}
18if version_is_at_least 4.5.99999999; then
19 MY_P=qt-everywhere-opensource-src-${MY_PV} 15MY_P=qt-everywhere-opensource-src-${MY_PV}
20 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
21 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
22 IUSE="+exceptions"
23else
24 MY_P=qt-x11-opensource-src-${MY_PV}
25fi
26 16
27HOMEPAGE="http://qt.nokia.com/" 17HOMEPAGE="http://qt.nokia.com/"
28SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" 18SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
29
30LICENSE="|| ( LGPL-2.1 GPL-3 )" 19LICENSE="|| ( LGPL-2.1 GPL-3 )"
31IUSE+=" debug" 20
21IUSE="aqua debug pch"
22
23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
32[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
33 IUSE+=" pch aqua" 25 IUSE+=" +exceptions"
26
27if version_is_at_least 4.7.99999999; then
28 IUSE+=" c++0x qpa"
29fi
34 30
35RDEPEND=" 31RDEPEND="
36 !<x11-libs/qt-assistant-${PV} 32 !<x11-libs/qt-assistant-${PV}
37 !>x11-libs/qt-assistant-${PV}-r9999 33 !>x11-libs/qt-assistant-${PV}-r9999
38 !<x11-libs/qt-core-${PV} 34 !<x11-libs/qt-core-${PV}
39 !>x11-libs/qt-core-${PV}-r9999 35 !>x11-libs/qt-core-${PV}-r9999
40 !<x11-libs/qt-dbus-${PV} 36 !<x11-libs/qt-dbus-${PV}
41 !>x11-libs/qt-dbus-${PV}-r9999 37 !>x11-libs/qt-dbus-${PV}-r9999
38 !<x11-libs/qt-declarative-${PV}
39 !>x11-libs/qt-declarative-${PV}-r9999
42 !<x11-libs/qt-demo-${PV} 40 !<x11-libs/qt-demo-${PV}
43 !>x11-libs/qt-demo-${PV}-r9999 41 !>x11-libs/qt-demo-${PV}-r9999
44 !<x11-libs/qt-gui-${PV} 42 !<x11-libs/qt-gui-${PV}
45 !>x11-libs/qt-gui-${PV}-r9999 43 !>x11-libs/qt-gui-${PV}-r9999
46 !<x11-libs/qt-multimedia-${PV} 44 !<x11-libs/qt-multimedia-${PV}
73qt4-build_pkg_setup() { 71qt4-build_pkg_setup() {
74 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
75 73
76 # Protect users by not allowing downgrades between releases 74 # Protect users by not allowing downgrades between releases
77 # Downgrading revisions within the same release should be allowed 75 # Downgrading revisions within the same release should be allowed
78 if has_version '>'${CATEGORY}/${P}-r9999 ; then 76 if has_version '>'${CATEGORY}/${P}-r9999; then
79 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 77 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
80 eerror "Sanity check to keep you from breaking your system:" 78 eerror "Sanity check to keep you from breaking your system:"
81 eerror " Downgrading Qt is completely unsupported and will break your system!" 79 eerror " Downgrading Qt is completely unsupported and will break your system!"
82 die "aborting to save your system" 80 die "aborting to save your system"
83 else 81 else
84 ewarn "Downgrading Qt is completely unsupported and will break your system!" 82 ewarn "Downgrading Qt is completely unsupported and will break your system!"
85 fi 83 fi
86 fi 84 fi
87 85
88 if [[ "${PN}" == "qt-webkit" ]]; then 86 if [[ ${PN} == "qt-webkit" ]]; then
89 eshopts_push -s extglob 87 eshopts_push -s extglob
90 if is-flagq '-g?(gdb)?([1-9])'; then 88 if is-flagq '-g?(gdb)?([1-9])'; then
91 echo 89 echo
92 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." 90 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
93 ewarn "You may experience really long compilation times and/or increased memory usage." 91 ewarn "You may experience really long compilation times and/or increased memory usage."
137# @FUNCTION: qt4-build_src_unpack 135# @FUNCTION: qt4-build_src_unpack
138# @DESCRIPTION: 136# @DESCRIPTION:
139# Unpacks the sources 137# Unpacks the sources
140qt4-build_src_unpack() { 138qt4-build_src_unpack() {
141 setqtenv 139 setqtenv
140 local unpack_p="${MY_P}"
141 case "${PV}" in
142 4.8.0_*)
143 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
144 ;;
145 esac
142 local target targets= 146 local target targets=
143 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
144 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 148 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
145 ${QT4_EXTRACT_DIRECTORIES}; do 149 ${QT4_EXTRACT_DIRECTORIES}; do
146 targets+=" ${MY_P}/${target}" 150 targets+=" ${unpack_p}/${target}"
147 done 151 done
148 152
149 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
150 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 154 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
155 case "${PV}" in
156 4.8.0_*)
157 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
158 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
159 ;;
160 esac
151} 161}
152 162
153# @ECLASS-VARIABLE: PATCHES 163# @ECLASS-VARIABLE: PATCHES
154# @DESCRIPTION: 164# @DESCRIPTION:
155# In case you have patches to apply, specify them in PATCHES variable. Make sure 165# In case you have patches to apply, specify them in PATCHES variable. Make sure
164# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 174# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
165# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 175# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
166qt4-build_src_prepare() { 176qt4-build_src_prepare() {
167 setqtenv 177 setqtenv
168 cd "${S}" 178 cd "${S}"
169 179
170 # fix qt 4.7 regression that skips -fvisibility=hidden 180 # fix qt 4.7 regression that skips -fvisibility=hidden
171 if version_is_at_least "4.7.0_beta1"; then 181 if version_is_at_least "4.7.0_beta1"; then
172 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
173 -i config.tests/unix/fvisibility.test || 183 -i config.tests/unix/fvisibility.test ||
174 die "visibility fixing sed failed" 184 die "visibility fixing sed failed"
175 fi 185 fi
186
187 if version_is_at_least "4.7"; then
176 # fix libx11 dependency on non X packages 188 # fix libX11 dependency on non X packages
177 if version_is_at_least "4.7.0_beta2"; then
178 local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 189 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
179 hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 190 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
180 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 191
192 qt_assistant_cleanup
181 fi 193 fi
182 194
183 if use aqua; then 195 if use aqua; then
184 # provide a proper macx-g++-64 196 # provide a proper macx-g++-64
185 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 197 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
188 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 200 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
189 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 201 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
190 fi 202 fi
191 203
192 if [[ ${PN} != qt-core ]]; then 204 if [[ ${PN} != qt-core ]]; then
193 skip_qmake_build_patch 205 skip_qmake_build
194 skip_project_generation_patch 206 skip_project_generation
195 symlink_binaries_to_buildtree 207 symlink_binaries_to_buildtree
196 fi 208 fi
197 209
198 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 210 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
199 # qmake bus errors with -O2 but -O3 works 211 # qmake bus errors with -O2 but -O3 works
202 214
203 # Bug 178652 215 # Bug 178652
204 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 216 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
205 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 217 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
206 append-flags -fno-gcse 218 append-flags -fno-gcse
219 fi
220
221 if use_if_iuse c++0x; then
222 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
223 ewarn "this is an official standard, some of the reverse dependencies"
224 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
225 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
226 ewarn "disabled."
227 append-flags -std=c++0x
207 fi 228 fi
208 229
209 # Unsupported old gcc versions - hardened needs this :( 230 # Unsupported old gcc versions - hardened needs this :(
210 if [[ $(gcc-major-version) -lt 4 ]] ; then 231 if [[ $(gcc-major-version) -lt 4 ]] ; then
211 ewarn "Appending -fno-stack-protector to CXXFLAGS" 232 ewarn "Appending -fno-stack-protector to CXXFLAGS"
220 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 241 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
221 append-flags -mminimal-toc 242 append-flags -mminimal-toc
222 fi 243 fi
223 244
224 # Bug 282984 && Bug 295530 245 # Bug 282984 && Bug 295530
225 sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 246 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
226 -i configure || die "sed qmake compilers failed" 247 -i configure || die "sed qmake compilers failed"
248
227 # bug 321335 249 # Bug 321335
228 if version_is_at_least 4.6; then 250 if version_is_at_least 4.6; then
229 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 251 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
230 xargs -0 \ 252 xargs -0 \
231 sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" LINK="$(tc-getCXX)":g" \ 253 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
232 -i || die "sed test compilers failed" 254 -i || die "sed test compilers failed"
233 fi 255 fi
234 256
235 # Bug 172219 257 # Bug 172219
236 sed -e "s:X11R6/::" \ 258 sed -e "s:X11R6/::" \
302 # this one is needed for all systems with a separate -liconv, apart from 324 # this one is needed for all systems with a separate -liconv, apart from
303 # Darwin, for which the sources already cater for -liconv 325 # Darwin, for which the sources already cater for -liconv
304 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 326 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
305 myconf+=" -liconv" 327 myconf+=" -liconv"
306 328
307 if has glib ${IUSE//+} && use glib; then 329 if use_if_iuse glib; then
308 # use -I, -L and -l from configure 330 # use -I, -L and -l from configure
309 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 331 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
310 # avoid the -pthread argument 332 # avoid the -pthread argument
311 myconf+=" ${glibflags//-pthread}" 333 myconf+=" ${glibflags//-pthread}"
312 unset glibflags 334 unset glibflags
335 fi
336
337 if use_if_iuse qpa; then
338 ewarn
339 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
340 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
341 ewarn "disable it before reporting any bugs related to this useflag."
342 ewarn
343 myconf+=" -qpa"
313 fi 344 fi
314 345
315 if use aqua ; then 346 if use aqua ; then
316 # On (snow) leopard use the new (frameworked) cocoa code. 347 # On (snow) leopard use the new (frameworked) cocoa code.
317 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 348 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
335 myconf+=" $(pkg-config --cflags freetype2)" 366 myconf+=" $(pkg-config --cflags freetype2)"
336 fi 367 fi
337 368
338 # Disable SSE4.x, since auto-detection is currently broken 369 # Disable SSE4.x, since auto-detection is currently broken
339 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623 370 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
340 if version_is_at_least 4.7.1; then 371 [[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
341 myconf+=" -no-sse4.1 -no-sse4.2"
342 fi
343 372
344 echo ./configure ${myconf} 373 echo ./configure ${myconf}
345 ./configure ${myconf} || die "./configure failed" 374 ./configure ${myconf} || die "./configure failed"
346 myconf="" 375 myconf=""
376
377 prepare_directories ${QT4_TARGET_DIRECTORIES}
347} 378}
348 379
349# @FUNCTION: qt4-build_src_compile 380# @FUNCTION: qt4-build_src_compile
381# @DESCRIPTION:
350# @DESCRIPTION: Actual compile phase 382# Actual compile phase
351qt4-build_src_compile() { 383qt4-build_src_compile() {
352 setqtenv 384 setqtenv
353 385
354 build_directories ${QT4_TARGET_DIRECTORIES} 386 build_directories ${QT4_TARGET_DIRECTORIES}
355} 387}
393# @DESCRIPTION: 425# @DESCRIPTION:
394# Perform the actual installation including some library fixes. 426# Perform the actual installation including some library fixes.
395qt4-build_src_install() { 427qt4-build_src_install() {
396 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
397 setqtenv 429 setqtenv
430
398 install_directories ${QT4_TARGET_DIRECTORIES} 431 install_directories ${QT4_TARGET_DIRECTORIES}
399 install_qconfigs 432 install_qconfigs
400 fix_library_files 433 fix_library_files
401 fix_includes 434 fix_includes
435
402 # remove .la files since we are building only shared Qt libraries 436 # remove .la files since we are building only shared Qt libraries
403 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 437 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
404} 438}
405 439
406# @FUNCTION: setqtenv 440# @FUNCTION: setqtenv
407setqtenv() { 441setqtenv() {
408 # Set up installation directories 442 # Set up installation directories
464 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 498 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
465 hppa|sh) myconf+=" -arch generic" ;; 499 hppa|sh) myconf+=" -arch generic" ;;
466 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 500 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
467 esac 501 esac
468 502
469 # 4.5: build everything but qt-xmlpatterns w/o exceptions
470 # 4.6: exceptions USE flag 503 # exceptions USE flag
471 local exceptions="-exceptions" 504 local exceptions="-exceptions"
472 case "${PV}" in
473 4.5.*)
474 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
475 ;;
476 *)
477 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" 505 in_iuse exceptions && exceptions="$(qt_use exceptions)"
478 ;;
479 esac
480 506
481 # note about -reduce-relocations: 507 # note about -reduce-relocations:
482 # That flag seems to introduce major breakage to applications, 508 # That flag seems to introduce major breakage to applications,
483 # mostly to be seen as a core dump with the message "QPixmap: Must 509 # mostly to be seen as a core dump with the message "QPixmap: Must
484 # construct a QApplication before a QPaintDevice" on Solaris 510 # construct a QApplication before a QPaintDevice" on Solaris
495 -nomake examples -nomake demos" 521 -nomake examples -nomake demos"
496 522
497 echo "${myconf}" 523 echo "${myconf}"
498} 524}
499 525
500# @FUNCTION: build_directories 526# @FUNCTION: prepare_directories
501# @USAGE: < directories > 527# @USAGE: < directories >
502# @DESCRIPTION: 528# @DESCRIPTION:
503# Compiles the code in $QT4_TARGET_DIRECTORIES 529# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
504build_directories() { 530prepare_directories() {
505 for x in "$@"; do 531 for x in "$@"; do
506 pushd "${S}"/${x} >/dev/null 532 pushd "${S}"/${x} >/dev/null
533 einfo "Running qmake in: ${x}"
507 # avoid running over the maximum argument number, bug #299810 534 # avoid running over the maximum argument number, bug #299810
508 { 535 {
509 echo "${S}"/mkspecs/common/*.conf 536 echo "${S}"/mkspecs/common/*.conf
510 find "${S}" -name '*.pr[io]' 537 find "${S}" -name '*.pr[io]'
511 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 538 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
512 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 539 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
540 popd >/dev/null
541 done
542}
543
544
545# @FUNCTION: build_directories
546# @USAGE: < directories >
547# @DESCRIPTION:
548# Compiles the code in $QT4_TARGET_DIRECTORIES
549build_directories() {
550 for x in "$@"; do
551 pushd "${S}"/${x} >/dev/null
513 emake CC="$(tc-getCC)" \ 552 emake CC="$(tc-getCC)" \
514 CXX="$(tc-getCXX)" \ 553 CXX="$(tc-getCXX)" \
515 LINK="$(tc-getCXX)" || die "emake failed" 554 LINK="$(tc-getCXX)" || die "emake failed"
516 popd >/dev/null 555 popd >/dev/null
517 done 556 done
543# @DESCRIPTION: 582# @DESCRIPTION:
544# List variables that should be defined at the top of QtCore/qconfig.h 583# List variables that should be defined at the top of QtCore/qconfig.h
545: ${QCONFIG_DEFINE:=} 584: ${QCONFIG_DEFINE:=}
546 585
547# @FUNCTION: install_qconfigs 586# @FUNCTION: install_qconfigs
587# @DESCRIPTION:
548# @DESCRIPTION: Install gentoo-specific mkspecs configurations 588# Install gentoo-specific mkspecs configurations
549install_qconfigs() { 589install_qconfigs() {
550 local x 590 local x
551 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 591 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
552 for x in QCONFIG_ADD QCONFIG_REMOVE; do 592 for x in QCONFIG_ADD QCONFIG_REMOVE; do
553 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 593 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
564 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 604 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
565 fi 605 fi
566} 606}
567 607
568# @FUNCTION: generate_qconfigs 608# @FUNCTION: generate_qconfigs
609# @DESCRIPTION:
569# @DESCRIPTION: Generates gentoo-specific configurations 610# Generates gentoo-specific configurations
570generate_qconfigs() { 611generate_qconfigs() {
571 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 612 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
572 local x qconfig_add qconfig_remove qconfig_new 613 local x qconfig_add qconfig_remove qconfig_new
573 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 614 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
574 [[ -f ${x} ]] || continue 615 [[ -f ${x} ]] || continue
588 629
589 # generate list of QT_CONFIG entries from the existing list 630 # generate list of QT_CONFIG entries from the existing list
590 # including qconfig_add and excluding qconfig_remove 631 # including qconfig_add and excluding qconfig_remove
591 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 632 for x in $(sed -n 's/^QT_CONFIG +=//p' \
592 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 633 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
593 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" 634 has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
594 done 635 done
595 636
596 # replace the existing QT_CONFIG list with qconfig_new 637 # replace the existing QT_CONFIG list with qconfig_new
597 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 638 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
598 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 639 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
622 fi 663 fi
623 fi 664 fi
624} 665}
625 666
626# @FUNCTION: qt4-build_pkg_postrm 667# @FUNCTION: qt4-build_pkg_postrm
668# @DESCRIPTION:
627# @DESCRIPTION: Generate configurations when the package is completely removed 669# Generate configurations when the package is completely removed
628qt4-build_pkg_postrm() { 670qt4-build_pkg_postrm() {
629 generate_qconfigs 671 generate_qconfigs
630} 672}
631 673
632# @FUNCTION: qt4-build_pkg_postinst 674# @FUNCTION: qt4-build_pkg_postinst
675# @DESCRIPTION:
633# @DESCRIPTION: Generate configuration, plus throws a message about possible 676# Generate configuration, plus throws a message about possible
634# breakages and proposed solutions. 677# breakages and proposed solutions.
635qt4-build_pkg_postinst() { 678qt4-build_pkg_postinst() {
636 generate_qconfigs 679 generate_qconfigs
637} 680}
638 681
639# @FUNCTION: skip_qmake_build_patch 682# @FUNCTION: skip_qmake_build
640# @DESCRIPTION: 683# @DESCRIPTION:
641# Don't need to build qmake, as it's already installed from qt-core 684# Don't need to build qmake, as it's already installed from qt-core
642skip_qmake_build_patch() { 685skip_qmake_build() {
643 # Don't need to build qmake, as it's already installed from qt-core 686 # Don't need to build qmake, as it's already installed from qt-core
644 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 687 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
645} 688}
646 689
647# @FUNCTION: skip_project_generation_patch 690# @FUNCTION: skip_project_generation
648# @DESCRIPTION: 691# @DESCRIPTION:
649# Exit the script early by throwing in an exit before all of the .pro files are scanned 692# Exit the script early by throwing in an exit before all of the .pro files are scanned
650skip_project_generation_patch() { 693skip_project_generation() {
651 # Exit the script early by throwing in an exit before all of the .pro files are scanned 694 # Exit the script early by throwing in an exit before all of the .pro files are scanned
652 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 695 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
653 -i "${S}"/configure || die "Sed failed" 696 -i "${S}"/configure || die "sed failed"
654} 697}
655 698
656# @FUNCTION: symlink_binaries_to_buildtree 699# @FUNCTION: symlink_binaries_to_buildtree
657# @DESCRIPTION: 700# @DESCRIPTION:
658# Symlink generated binaries to buildtree so they can be used during compilation 701# Symlink generated binaries to buildtree so they can be used during compilation
659# time 702# time
660symlink_binaries_to_buildtree() { 703symlink_binaries_to_buildtree() {
661 for bin in qmake moc uic rcc; do 704 for bin in qmake moc uic rcc; do
662 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 705 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
663 done 706 done
664} 707}
665 708
666# @FUNCTION: fix_library_files 709# @FUNCTION: fix_library_files
667# @DESCRIPTION: 710# @DESCRIPTION:
668# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 711# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
669# moves the *.pc-files into the pkgconfig directory 712# moves the *.pc-files into the pkgconfig directory
670fix_library_files() { 713fix_library_files() {
671 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 714 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
672 if [[ -e ${libfile} ]]; then 715 if [[ -e ${libfile} ]]; then
673 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 716 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
674 fi 717 fi
675 done 718 done
676 719
677 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 720 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
678 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 721 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
679 if [[ -e ${libfile} ]]; then 722 if [[ -e ${libfile} ]]; then
680 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 723 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
681 724
682 # Move .pc files into the pkgconfig directory 725 # Move .pc files into the pkgconfig directory
683 dodir ${QTPCDIR#${EPREFIX}} 726 dodir ${QTPCDIR#${EPREFIX}}
684 mv ${libfile} "${D}"/${QTPCDIR}/ \ 727 mv ${libfile} "${D}"/${QTPCDIR}/ \
685 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 728 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
686 fi 729 fi
687 done 730 done
688 731
689 # Don't install an empty directory 732 # Don't install an empty directory
690 rmdir "${D}"/${QTLIBDIR}/pkgconfig 733 rmdir "${D}"/${QTLIBDIR}/pkgconfig
739 *-solaris*) 782 *-solaris*)
740 spec=solaris ;; 783 spec=solaris ;;
741 *-linux-*|*-linux) 784 *-linux-*|*-linux)
742 spec=linux ;; 785 spec=linux ;;
743 *) 786 *)
744 die "Unknown CHOST, no platform choosen." 787 die "Unknown CHOST, no platform chosen"
745 esac 788 esac
746 789
747 CXX=$(tc-getCXX) 790 CXX=$(tc-getCXX)
748 if [[ ${CXX} == *g++* ]]; then 791 if [[ ${CXX} == *g++* ]]; then
749 spec+=-g++ 792 spec+=-g++
750 elif [[ ${CXX} == *icpc* ]]; then 793 elif [[ ${CXX} == *icpc* ]]; then
751 spec+=-icc 794 spec+=-icc
752 else 795 else
753 die "Unknown compiler ${CXX}." 796 die "Unknown compiler '${CXX}'"
754 fi 797 fi
755 if [[ -n ${LIBDIR/lib} ]]; then 798 if [[ -n ${LIBDIR/lib} ]]; then
756 spec+=-${LIBDIR/lib} 799 spec+=-${LIBDIR/lib}
757 fi 800 fi
758 801
770} 813}
771 814
772# @FUNCTION: qt_assistant_cleanup 815# @FUNCTION: qt_assistant_cleanup
773# @RETURN: nothing 816# @RETURN: nothing
774# @DESCRIPTION: 817# @DESCRIPTION:
775# Tries to clean up tools.pro for qt-assistant ebuilds 818# Tries to clean up tools.pro for qt-assistant ebuilds.
776# Meant to be called in src_prepare 819# Meant to be called in src_prepare().
820# Since Qt 4.7.4 this function is a no-op.
777qt_assistant_cleanup() { 821qt_assistant_cleanup() {
822 # apply patching to qt-assistant ebuilds only
823 [[ ${PN} != "qt-assistant" ]] && return
824
825 # no longer needed for 4.7.4 and later
826 version_is_at_least "4.7.4" && return
827
778 # different versions (and branches...) may need different handling, 828 # different versions (and branches...) may need different handling,
779 # add a case if you need special handling 829 # add a case if you need special handling
780 case "${MY_PV_EXTRA}" in 830 case "${MY_PV_EXTRA}" in
781 *kde-qt*) 831 *kde-qt*)
782 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 832 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
795# @FUNCTION: qt_nolibx11 845# @FUNCTION: qt_nolibx11
796# @RETURN: nothing 846# @RETURN: nothing
797# @DESCRIPTION: 847# @DESCRIPTION:
798# Ignore X11 tests for packages that don't need X libraries installed 848# Ignore X11 tests for packages that don't need X libraries installed
799qt_nolibx11() { 849qt_nolibx11() {
800 einfo "removing X11 check to allow X-less compilation" 850 einfo "Removing X11 check to allow X-less compilation"
801 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 851 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
802 die "x11 check sed failed" 852 die "x11 check sed failed"
803} 853}
804 854
805EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 855EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20