/[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.90 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.90 2011/03/10 23:45:51 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 )"
20
31IUSE+=" debug pch aqua" 21IUSE="aqua debug pch"
22
23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
25 IUSE+=" +exceptions"
26
27if version_is_at_least 4.7.99999999; then
28 IUSE+=" c++0x qpa"
29fi
32 30
33RDEPEND=" 31RDEPEND="
34 !<x11-libs/qt-assistant-${PV} 32 !<x11-libs/qt-assistant-${PV}
35 !>x11-libs/qt-assistant-${PV}-r9999 33 !>x11-libs/qt-assistant-${PV}-r9999
36 !<x11-libs/qt-core-${PV} 34 !<x11-libs/qt-core-${PV}
37 !>x11-libs/qt-core-${PV}-r9999 35 !>x11-libs/qt-core-${PV}-r9999
38 !<x11-libs/qt-dbus-${PV} 36 !<x11-libs/qt-dbus-${PV}
39 !>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
40 !<x11-libs/qt-demo-${PV} 40 !<x11-libs/qt-demo-${PV}
41 !>x11-libs/qt-demo-${PV}-r9999 41 !>x11-libs/qt-demo-${PV}-r9999
42 !<x11-libs/qt-gui-${PV} 42 !<x11-libs/qt-gui-${PV}
43 !>x11-libs/qt-gui-${PV}-r9999 43 !>x11-libs/qt-gui-${PV}-r9999
44 !<x11-libs/qt-multimedia-${PV} 44 !<x11-libs/qt-multimedia-${PV}
71qt4-build_pkg_setup() { 71qt4-build_pkg_setup() {
72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
73 73
74 # Protect users by not allowing downgrades between releases 74 # Protect users by not allowing downgrades between releases
75 # Downgrading revisions within the same release should be allowed 75 # Downgrading revisions within the same release should be allowed
76 if has_version '>'${CATEGORY}/${P}-r9999 ; then 76 if has_version '>'${CATEGORY}/${P}-r9999; then
77 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 77 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
78 eerror "Sanity check to keep you from breaking your system:" 78 eerror "Sanity check to keep you from breaking your system:"
79 eerror " Downgrading Qt is completely unsupported and will break your system!" 79 eerror " Downgrading Qt is completely unsupported and will break your system!"
80 die "aborting to save your system" 80 die "aborting to save your system"
81 else 81 else
82 ewarn "Downgrading Qt is completely unsupported and will break your system!" 82 ewarn "Downgrading Qt is completely unsupported and will break your system!"
83 fi 83 fi
84 fi 84 fi
85 85
86 if [[ "${PN}" == "qt-webkit" ]]; then 86 if [[ ${PN} == "qt-webkit" ]]; then
87 eshopts_push -s extglob 87 eshopts_push -s extglob
88 if is-flagq '-g?(gdb)?([1-9])'; then 88 if is-flagq '-g?(gdb)?([1-9])'; then
89 echo 89 echo
90 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)."
91 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."
135# @FUNCTION: qt4-build_src_unpack 135# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION: 136# @DESCRIPTION:
137# Unpacks the sources 137# Unpacks the sources
138qt4-build_src_unpack() { 138qt4-build_src_unpack() {
139 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
140 local target targets= 146 local target targets=
141 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
142 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 \
143 ${QT4_EXTRACT_DIRECTORIES}; do 149 ${QT4_EXTRACT_DIRECTORIES}; do
144 targets+=" ${MY_P}/${target}" 150 targets+=" ${unpack_p}/${target}"
145 done 151 done
146 152
147 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
148 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
149} 161}
150 162
151# @ECLASS-VARIABLE: PATCHES 163# @ECLASS-VARIABLE: PATCHES
152# @DESCRIPTION: 164# @DESCRIPTION:
153# 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
162# 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
163# 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.
164qt4-build_src_prepare() { 176qt4-build_src_prepare() {
165 setqtenv 177 setqtenv
166 cd "${S}" 178 cd "${S}"
167 179
168 # fix qt 4.7 regression that skips -fvisibility=hidden 180 # fix qt 4.7 regression that skips -fvisibility=hidden
169 if version_is_at_least "4.7.0_beta1"; then 181 if version_is_at_least "4.7.0_beta1"; then
170 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
171 -i config.tests/unix/fvisibility.test || 183 -i config.tests/unix/fvisibility.test ||
172 die "visibility fixing sed failed" 184 die "visibility fixing sed failed"
173 fi 185 fi
186
187 if version_is_at_least "4.7"; then
174 # fix libx11 dependency on non X packages 188 # fix libX11 dependency on non X packages
175 if version_is_at_least "4.7.0_beta2"; then
176 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"
177 hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 190 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
178 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 191
192 qt_assistant_cleanup
179 fi 193 fi
180 194
181 if use aqua; then 195 if use aqua; then
182 # provide a proper macx-g++-64 196 # provide a proper macx-g++-64
183 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 197 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
186 -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:' \
187 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 201 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
188 fi 202 fi
189 203
190 if [[ ${PN} != qt-core ]]; then 204 if [[ ${PN} != qt-core ]]; then
191 skip_qmake_build_patch 205 skip_qmake_build
192 skip_project_generation_patch 206 skip_project_generation
193 symlink_binaries_to_buildtree 207 symlink_binaries_to_buildtree
194 fi 208 fi
195 209
196 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 210 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
197 # qmake bus errors with -O2 but -O3 works 211 # qmake bus errors with -O2 but -O3 works
200 214
201 # Bug 178652 215 # Bug 178652
202 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 216 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
203 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 217 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
204 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
205 fi 228 fi
206 229
207 # Unsupported old gcc versions - hardened needs this :( 230 # Unsupported old gcc versions - hardened needs this :(
208 if [[ $(gcc-major-version) -lt 4 ]] ; then 231 if [[ $(gcc-major-version) -lt 4 ]] ; then
209 ewarn "Appending -fno-stack-protector to CXXFLAGS" 232 ewarn "Appending -fno-stack-protector to CXXFLAGS"
220 fi 243 fi
221 244
222 # Bug 282984 && Bug 295530 245 # Bug 282984 && Bug 295530
223 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:" \
224 -i configure || die "sed qmake compilers failed" 247 -i configure || die "sed qmake compilers failed"
248
225 # bug 321335 249 # Bug 321335
226 if version_is_at_least 4.6; then 250 if version_is_at_least 4.6; then
227 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 '{}' \; | \
228 xargs -0 \ 252 xargs -0 \
229 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" \
230 -i || die "sed test compilers failed" 254 -i || die "sed test compilers failed"
300 # 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
301 # Darwin, for which the sources already cater for -liconv 325 # Darwin, for which the sources already cater for -liconv
302 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 326 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
303 myconf+=" -liconv" 327 myconf+=" -liconv"
304 328
305 if has glib ${IUSE//+} && use glib; then 329 if use_if_iuse glib; then
306 # use -I, -L and -l from configure 330 # use -I, -L and -l from configure
307 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)"
308 # avoid the -pthread argument 332 # avoid the -pthread argument
309 myconf+=" ${glibflags//-pthread}" 333 myconf+=" ${glibflags//-pthread}"
310 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"
311 fi 344 fi
312 345
313 if use aqua ; then 346 if use aqua ; then
314 # On (snow) leopard use the new (frameworked) cocoa code. 347 # On (snow) leopard use the new (frameworked) cocoa code.
315 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 348 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
343 376
344 prepare_directories ${QT4_TARGET_DIRECTORIES} 377 prepare_directories ${QT4_TARGET_DIRECTORIES}
345} 378}
346 379
347# @FUNCTION: qt4-build_src_compile 380# @FUNCTION: qt4-build_src_compile
381# @DESCRIPTION:
348# @DESCRIPTION: Actual compile phase 382# Actual compile phase
349qt4-build_src_compile() { 383qt4-build_src_compile() {
350 setqtenv 384 setqtenv
351 385
352 build_directories ${QT4_TARGET_DIRECTORIES} 386 build_directories ${QT4_TARGET_DIRECTORIES}
353} 387}
391# @DESCRIPTION: 425# @DESCRIPTION:
392# Perform the actual installation including some library fixes. 426# Perform the actual installation including some library fixes.
393qt4-build_src_install() { 427qt4-build_src_install() {
394 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
395 setqtenv 429 setqtenv
430
396 install_directories ${QT4_TARGET_DIRECTORIES} 431 install_directories ${QT4_TARGET_DIRECTORIES}
397 install_qconfigs 432 install_qconfigs
398 fix_library_files 433 fix_library_files
399 fix_includes 434 fix_includes
435
400 # remove .la files since we are building only shared Qt libraries 436 # remove .la files since we are building only shared Qt libraries
401 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 437 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
402} 438}
403 439
404# @FUNCTION: setqtenv 440# @FUNCTION: setqtenv
405setqtenv() { 441setqtenv() {
406 # Set up installation directories 442 # Set up installation directories
462 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 498 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
463 hppa|sh) myconf+=" -arch generic" ;; 499 hppa|sh) myconf+=" -arch generic" ;;
464 *) 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." ;;
465 esac 501 esac
466 502
467 # 4.5: build everything but qt-xmlpatterns w/o exceptions
468 # 4.6: exceptions USE flag 503 # exceptions USE flag
469 local exceptions="-exceptions" 504 local exceptions="-exceptions"
470 case "${PV}" in
471 4.5.*)
472 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
473 ;;
474 *)
475 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" 505 in_iuse exceptions && exceptions="$(qt_use exceptions)"
476 ;;
477 esac
478 506
479 # note about -reduce-relocations: 507 # note about -reduce-relocations:
480 # That flag seems to introduce major breakage to applications, 508 # That flag seems to introduce major breakage to applications,
481 # 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
482 # construct a QApplication before a QPaintDevice" on Solaris 510 # construct a QApplication before a QPaintDevice" on Solaris
500# @DESCRIPTION: 528# @DESCRIPTION:
501# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 529# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
502prepare_directories() { 530prepare_directories() {
503 for x in "$@"; do 531 for x in "$@"; do
504 pushd "${S}"/${x} >/dev/null 532 pushd "${S}"/${x} >/dev/null
505 einfo "running qmake in: $x" 533 einfo "Running qmake in: ${x}"
506 # avoid running over the maximum argument number, bug #299810 534 # avoid running over the maximum argument number, bug #299810
507 { 535 {
508 echo "${S}"/mkspecs/common/*.conf 536 echo "${S}"/mkspecs/common/*.conf
509 find "${S}" -name '*.pr[io]' 537 find "${S}" -name '*.pr[io]'
510 } | 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
554# @DESCRIPTION: 582# @DESCRIPTION:
555# 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
556: ${QCONFIG_DEFINE:=} 584: ${QCONFIG_DEFINE:=}
557 585
558# @FUNCTION: install_qconfigs 586# @FUNCTION: install_qconfigs
587# @DESCRIPTION:
559# @DESCRIPTION: Install gentoo-specific mkspecs configurations 588# Install gentoo-specific mkspecs configurations
560install_qconfigs() { 589install_qconfigs() {
561 local x 590 local x
562 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 591 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
563 for x in QCONFIG_ADD QCONFIG_REMOVE; do 592 for x in QCONFIG_ADD QCONFIG_REMOVE; do
564 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 593 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
575 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"
576 fi 605 fi
577} 606}
578 607
579# @FUNCTION: generate_qconfigs 608# @FUNCTION: generate_qconfigs
609# @DESCRIPTION:
580# @DESCRIPTION: Generates gentoo-specific configurations 610# Generates gentoo-specific configurations
581generate_qconfigs() { 611generate_qconfigs() {
582 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
583 local x qconfig_add qconfig_remove qconfig_new 613 local x qconfig_add qconfig_remove qconfig_new
584 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 614 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
585 [[ -f ${x} ]] || continue 615 [[ -f ${x} ]] || continue
599 629
600 # generate list of QT_CONFIG entries from the existing list 630 # generate list of QT_CONFIG entries from the existing list
601 # including qconfig_add and excluding qconfig_remove 631 # including qconfig_add and excluding qconfig_remove
602 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 632 for x in $(sed -n 's/^QT_CONFIG +=//p' \
603 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 633 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
604 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" 634 has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
605 done 635 done
606 636
607 # replace the existing QT_CONFIG list with qconfig_new 637 # replace the existing QT_CONFIG list with qconfig_new
608 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 638 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
609 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 639 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
633 fi 663 fi
634 fi 664 fi
635} 665}
636 666
637# @FUNCTION: qt4-build_pkg_postrm 667# @FUNCTION: qt4-build_pkg_postrm
668# @DESCRIPTION:
638# @DESCRIPTION: Generate configurations when the package is completely removed 669# Generate configurations when the package is completely removed
639qt4-build_pkg_postrm() { 670qt4-build_pkg_postrm() {
640 generate_qconfigs 671 generate_qconfigs
641} 672}
642 673
643# @FUNCTION: qt4-build_pkg_postinst 674# @FUNCTION: qt4-build_pkg_postinst
675# @DESCRIPTION:
644# @DESCRIPTION: Generate configuration, plus throws a message about possible 676# Generate configuration, plus throws a message about possible
645# breakages and proposed solutions. 677# breakages and proposed solutions.
646qt4-build_pkg_postinst() { 678qt4-build_pkg_postinst() {
647 generate_qconfigs 679 generate_qconfigs
648} 680}
649 681
650# @FUNCTION: skip_qmake_build_patch 682# @FUNCTION: skip_qmake_build
651# @DESCRIPTION: 683# @DESCRIPTION:
652# 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
653skip_qmake_build_patch() { 685skip_qmake_build() {
654 # 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
655 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"
656} 688}
657 689
658# @FUNCTION: skip_project_generation_patch 690# @FUNCTION: skip_project_generation
659# @DESCRIPTION: 691# @DESCRIPTION:
660# 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
661skip_project_generation_patch() { 693skip_project_generation() {
662 # 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
663 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 695 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
664 -i "${S}"/configure || die "Sed failed" 696 -i "${S}"/configure || die "sed failed"
665} 697}
666 698
667# @FUNCTION: symlink_binaries_to_buildtree 699# @FUNCTION: symlink_binaries_to_buildtree
668# @DESCRIPTION: 700# @DESCRIPTION:
669# 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
670# time 702# time
671symlink_binaries_to_buildtree() { 703symlink_binaries_to_buildtree() {
672 for bin in qmake moc uic rcc; do 704 for bin in qmake moc uic rcc; do
673 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"
674 done 706 done
675} 707}
676 708
677# @FUNCTION: fix_library_files 709# @FUNCTION: fix_library_files
678# @DESCRIPTION: 710# @DESCRIPTION:
679# 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
680# moves the *.pc-files into the pkgconfig directory 712# moves the *.pc-files into the pkgconfig directory
681fix_library_files() { 713fix_library_files() {
682 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 714 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
683 if [[ -e ${libfile} ]]; then 715 if [[ -e ${libfile} ]]; then
684 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"
685 fi 717 fi
686 done 718 done
687 719
688 # 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:
689 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 721 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
690 if [[ -e ${libfile} ]]; then 722 if [[ -e ${libfile} ]]; then
691 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"
692 724
693 # Move .pc files into the pkgconfig directory 725 # Move .pc files into the pkgconfig directory
694 dodir ${QTPCDIR#${EPREFIX}} 726 dodir ${QTPCDIR#${EPREFIX}}
695 mv ${libfile} "${D}"/${QTPCDIR}/ \ 727 mv ${libfile} "${D}"/${QTPCDIR}/ \
696 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 728 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
697 fi 729 fi
698 done 730 done
699 731
700 # Don't install an empty directory 732 # Don't install an empty directory
701 rmdir "${D}"/${QTLIBDIR}/pkgconfig 733 rmdir "${D}"/${QTLIBDIR}/pkgconfig
750 *-solaris*) 782 *-solaris*)
751 spec=solaris ;; 783 spec=solaris ;;
752 *-linux-*|*-linux) 784 *-linux-*|*-linux)
753 spec=linux ;; 785 spec=linux ;;
754 *) 786 *)
755 die "Unknown CHOST, no platform choosen." 787 die "Unknown CHOST, no platform chosen"
756 esac 788 esac
757 789
758 CXX=$(tc-getCXX) 790 CXX=$(tc-getCXX)
759 if [[ ${CXX} == *g++* ]]; then 791 if [[ ${CXX} == *g++* ]]; then
760 spec+=-g++ 792 spec+=-g++
761 elif [[ ${CXX} == *icpc* ]]; then 793 elif [[ ${CXX} == *icpc* ]]; then
762 spec+=-icc 794 spec+=-icc
763 else 795 else
764 die "Unknown compiler ${CXX}." 796 die "Unknown compiler '${CXX}'"
765 fi 797 fi
766 if [[ -n ${LIBDIR/lib} ]]; then 798 if [[ -n ${LIBDIR/lib} ]]; then
767 spec+=-${LIBDIR/lib} 799 spec+=-${LIBDIR/lib}
768 fi 800 fi
769 801
781} 813}
782 814
783# @FUNCTION: qt_assistant_cleanup 815# @FUNCTION: qt_assistant_cleanup
784# @RETURN: nothing 816# @RETURN: nothing
785# @DESCRIPTION: 817# @DESCRIPTION:
786# Tries to clean up tools.pro for qt-assistant ebuilds 818# Tries to clean up tools.pro for qt-assistant ebuilds.
787# 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.
788qt_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
789 # different versions (and branches...) may need different handling, 828 # different versions (and branches...) may need different handling,
790 # add a case if you need special handling 829 # add a case if you need special handling
791 case "${MY_PV_EXTRA}" in 830 case "${MY_PV_EXTRA}" in
792 *kde-qt*) 831 *kde-qt*)
793 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 832 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
806# @FUNCTION: qt_nolibx11 845# @FUNCTION: qt_nolibx11
807# @RETURN: nothing 846# @RETURN: nothing
808# @DESCRIPTION: 847# @DESCRIPTION:
809# 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
810qt_nolibx11() { 849qt_nolibx11() {
811 einfo "removing X11 check to allow X-less compilation" 850 einfo "Removing X11 check to allow X-less compilation"
812 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 ||
813 die "x11 check sed failed" 852 die "x11 check sed failed"
814} 853}
815 854
816EXPORT_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.90  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20