/[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.93 Revision 1.102
1# Copyright 1999-2011 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.93 2011/08/22 04:46:32 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.102 2011/12/08 17:21:45 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}
16
17HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
18SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
19LICENSE="|| ( LGPL-2.1 GPL-3 )"
20
21IUSE="aqua debug pch"
22
20 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
21 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
22 IUSE="+exceptions" 25 IUSE+=" +exceptions"
23else 26
24 MY_P=qt-x11-opensource-src-${MY_PV} 27if version_is_at_least 4.7.99999999; then
28 IUSE+=" c++0x qpa"
25fi 29fi
26 30
27HOMEPAGE="http://qt.nokia.com/" 31DEPEND="dev-util/pkgconfig"
28SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
29
30LICENSE="|| ( LGPL-2.1 GPL-3 )"
31IUSE+=" debug pch aqua"
32
33RDEPEND=" 32RDEPEND="
34 !<x11-libs/qt-assistant-${PV} 33 !<x11-libs/qt-assistant-${PV}
35 !>x11-libs/qt-assistant-${PV}-r9999 34 !>x11-libs/qt-assistant-${PV}-r9999
36 !<x11-libs/qt-core-${PV} 35 !<x11-libs/qt-core-${PV}
37 !>x11-libs/qt-core-${PV}-r9999 36 !>x11-libs/qt-core-${PV}-r9999
38 !<x11-libs/qt-dbus-${PV} 37 !<x11-libs/qt-dbus-${PV}
39 !>x11-libs/qt-dbus-${PV}-r9999 38 !>x11-libs/qt-dbus-${PV}-r9999
39 !<x11-libs/qt-declarative-${PV}
40 !>x11-libs/qt-declarative-${PV}-r9999
40 !<x11-libs/qt-demo-${PV} 41 !<x11-libs/qt-demo-${PV}
41 !>x11-libs/qt-demo-${PV}-r9999 42 !>x11-libs/qt-demo-${PV}-r9999
42 !<x11-libs/qt-gui-${PV} 43 !<x11-libs/qt-gui-${PV}
43 !>x11-libs/qt-gui-${PV}-r9999 44 !>x11-libs/qt-gui-${PV}-r9999
44 !<x11-libs/qt-multimedia-${PV} 45 !<x11-libs/qt-multimedia-${PV}
71qt4-build_pkg_setup() { 72qt4-build_pkg_setup() {
72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
73 74
74 # Protect users by not allowing downgrades between releases 75 # Protect users by not allowing downgrades between releases
75 # Downgrading revisions within the same release should be allowed 76 # Downgrading revisions within the same release should be allowed
76 if has_version '>'${CATEGORY}/${P}-r9999 ; then 77 if has_version '>'${CATEGORY}/${P}-r9999; then
77 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 78 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
78 eerror "Sanity check to keep you from breaking your system:" 79 eerror "Sanity check to keep you from breaking your system:"
79 eerror " Downgrading Qt is completely unsupported and will break your system!" 80 eerror " Downgrading Qt is completely unsupported and will break your system!"
80 die "aborting to save your system" 81 die "aborting to save your system"
81 else 82 else
82 ewarn "Downgrading Qt is completely unsupported and will break your system!" 83 ewarn "Downgrading Qt is completely unsupported and will break your system!"
83 fi 84 fi
84 fi 85 fi
85 86
86 if [[ "${PN}" == "qt-webkit" ]]; then 87 if [[ ${PN} == "qt-webkit" ]]; then
87 eshopts_push -s extglob 88 eshopts_push -s extglob
88 if is-flagq '-g?(gdb)?([1-9])'; then 89 if is-flagq '-g?(gdb)?([1-9])'; then
89 echo 90 echo
90 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." 91 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." 92 ewarn "You may experience really long compilation times and/or increased memory usage."
137# Unpacks the sources 138# Unpacks the sources
138qt4-build_src_unpack() { 139qt4-build_src_unpack() {
139 setqtenv 140 setqtenv
140 local unpack_p="${MY_P}" 141 local unpack_p="${MY_P}"
141 case "${PV}" in 142 case "${PV}" in
142 4.8.0_beta*) 143 4.8.0_*)
143 unpack_p="qt-everywhere-opensource-src-${PV/_*}" 144 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
144 ;; 145 ;;
145 esac 146 esac
146 local target targets= 147 local target targets=
147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 148 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
151 done 152 done
152 153
153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 154 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
154 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 155 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
155 case "${PV}" in 156 case "${PV}" in
156 4.8.0_beta*) 157 4.8.0_*)
157 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \ 158 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
158 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV} 159 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
159 ;; 160 ;;
160 esac 161 esac
161} 162}
174# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 175# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
175# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 176# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
176qt4-build_src_prepare() { 177qt4-build_src_prepare() {
177 setqtenv 178 setqtenv
178 cd "${S}" 179 cd "${S}"
179 180
180 # fix qt 4.7 regression that skips -fvisibility=hidden 181 # fix qt 4.7 regression that skips -fvisibility=hidden
181 if version_is_at_least "4.7.0_beta1"; then 182 if version_is_at_least "4.7.0_beta1"; then
182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 183 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
183 -i config.tests/unix/fvisibility.test || 184 -i config.tests/unix/fvisibility.test ||
184 die "visibility fixing sed failed" 185 die "visibility fixing sed failed"
185 fi 186 fi
187
188 if version_is_at_least "4.7"; then
186 # fix libx11 dependency on non X packages 189 # fix libX11 dependency on non X packages
187 if version_is_at_least "4.7.0_beta2"; then
188 local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 190 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
189 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 191 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
190 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 192
193 qt_assistant_cleanup
191 fi 194 fi
192 195
193 if use aqua; then 196 if use aqua; then
194 # provide a proper macx-g++-64 197 # provide a proper macx-g++-64
195 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 198 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
198 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 201 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
199 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 202 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
200 fi 203 fi
201 204
202 if [[ ${PN} != qt-core ]]; then 205 if [[ ${PN} != qt-core ]]; then
203 skip_qmake_build_patch 206 skip_qmake_build
204 skip_project_generation_patch 207 skip_project_generation
205 symlink_binaries_to_buildtree 208 symlink_binaries_to_buildtree
206 fi 209 fi
207 210
208 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 211 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
209 # qmake bus errors with -O2 but -O3 works 212 # qmake bus errors with -O2 but -O3 works
212 215
213 # Bug 178652 216 # Bug 178652
214 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 217 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
215 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 218 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
216 append-flags -fno-gcse 219 append-flags -fno-gcse
220 fi
221
222 if use_if_iuse c++0x; then
223 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
224 ewarn "this is an official standard, some of the reverse dependencies"
225 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
226 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
227 ewarn "disabled."
228 append-flags -std=c++0x
217 fi 229 fi
218 230
219 # Unsupported old gcc versions - hardened needs this :( 231 # Unsupported old gcc versions - hardened needs this :(
220 if [[ $(gcc-major-version) -lt 4 ]] ; then 232 if [[ $(gcc-major-version) -lt 4 ]] ; then
221 ewarn "Appending -fno-stack-protector to CXXFLAGS" 233 ewarn "Appending -fno-stack-protector to CXXFLAGS"
232 fi 244 fi
233 245
234 # Bug 282984 && Bug 295530 246 # Bug 282984 && Bug 295530
235 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 247 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
236 -i configure || die "sed qmake compilers failed" 248 -i configure || die "sed qmake compilers failed"
249
237 # bug 321335 250 # Bug 321335
238 if version_is_at_least 4.6; then 251 if version_is_at_least 4.6; then
239 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 252 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
240 xargs -0 \ 253 xargs -0 \
241 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ 254 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
242 -i || die "sed test compilers failed" 255 -i || die "sed test compilers failed"
312 # this one is needed for all systems with a separate -liconv, apart from 325 # this one is needed for all systems with a separate -liconv, apart from
313 # Darwin, for which the sources already cater for -liconv 326 # Darwin, for which the sources already cater for -liconv
314 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 327 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
315 myconf+=" -liconv" 328 myconf+=" -liconv"
316 329
317 if has glib ${IUSE//+} && use glib; then 330 if use_if_iuse glib; then
318 # use -I, -L and -l from configure 331 # use -I, -L and -l from configure
319 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 332 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
320 # avoid the -pthread argument 333 # avoid the -pthread argument
321 myconf+=" ${glibflags//-pthread}" 334 myconf+=" ${glibflags//-pthread}"
322 unset glibflags 335 unset glibflags
336 fi
337
338 if use_if_iuse qpa; then
339 ewarn
340 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"
342 ewarn "disable it before reporting any bugs related to this useflag."
343 ewarn
344 myconf+=" -qpa"
323 fi 345 fi
324 346
325 if use aqua ; then 347 if use aqua ; then
326 # On (snow) leopard use the new (frameworked) cocoa code. 348 # On (snow) leopard use the new (frameworked) cocoa code.
327 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 349 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
404# @DESCRIPTION: 426# @DESCRIPTION:
405# Perform the actual installation including some library fixes. 427# Perform the actual installation including some library fixes.
406qt4-build_src_install() { 428qt4-build_src_install() {
407 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 429 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
408 setqtenv 430 setqtenv
431
409 install_directories ${QT4_TARGET_DIRECTORIES} 432 install_directories ${QT4_TARGET_DIRECTORIES}
410 install_qconfigs 433 install_qconfigs
411 fix_library_files 434 fix_library_files
412 fix_includes 435 fix_includes
436
413 # remove .la files since we are building only shared Qt libraries 437 # remove .la files since we are building only shared Qt libraries
414 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 438 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
415} 439}
416 440
417# @FUNCTION: setqtenv 441# @FUNCTION: setqtenv
475 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 499 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
476 hppa|sh) myconf+=" -arch generic" ;; 500 hppa|sh) myconf+=" -arch generic" ;;
477 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 501 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
478 esac 502 esac
479 503
480 # 4.5: build everything but qt-xmlpatterns w/o exceptions
481 # 4.6: exceptions USE flag 504 # exceptions USE flag
482 local exceptions="-exceptions" 505 local exceptions="-exceptions"
483 case "${PV}" in
484 4.5.*)
485 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
486 ;;
487 *)
488 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" 506 in_iuse exceptions && exceptions="$(qt_use exceptions)"
489 ;;
490 esac
491 507
492 # note about -reduce-relocations: 508 # note about -reduce-relocations:
493 # That flag seems to introduce major breakage to applications, 509 # That flag seems to introduce major breakage to applications,
494 # mostly to be seen as a core dump with the message "QPixmap: Must 510 # mostly to be seen as a core dump with the message "QPixmap: Must
495 # construct a QApplication before a QPaintDevice" on Solaris 511 # construct a QApplication before a QPaintDevice" on Solaris
513# @DESCRIPTION: 529# @DESCRIPTION:
514# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 530# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
515prepare_directories() { 531prepare_directories() {
516 for x in "$@"; do 532 for x in "$@"; do
517 pushd "${S}"/${x} >/dev/null 533 pushd "${S}"/${x} >/dev/null
518 einfo "running qmake in: $x" 534 einfo "Running qmake in: ${x}"
519 # avoid running over the maximum argument number, bug #299810 535 # avoid running over the maximum argument number, bug #299810
520 { 536 {
521 echo "${S}"/mkspecs/common/*.conf 537 echo "${S}"/mkspecs/common/*.conf
522 find "${S}" -name '*.pr[io]' 538 find "${S}" -name '*.pr[io]'
523 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 539 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
662# breakages and proposed solutions. 678# breakages and proposed solutions.
663qt4-build_pkg_postinst() { 679qt4-build_pkg_postinst() {
664 generate_qconfigs 680 generate_qconfigs
665} 681}
666 682
667# @FUNCTION: skip_qmake_build_patch 683# @FUNCTION: skip_qmake_build
668# @DESCRIPTION: 684# @DESCRIPTION:
669# Don't need to build qmake, as it's already installed from qt-core 685# Don't need to build qmake, as it's already installed from qt-core
670skip_qmake_build_patch() { 686skip_qmake_build() {
671 # Don't need to build qmake, as it's already installed from qt-core 687 # Don't need to build qmake, as it's already installed from qt-core
672 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 688 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
673} 689}
674 690
675# @FUNCTION: skip_project_generation_patch 691# @FUNCTION: skip_project_generation
676# @DESCRIPTION: 692# @DESCRIPTION:
677# Exit the script early by throwing in an exit before all of the .pro files are scanned 693# Exit the script early by throwing in an exit before all of the .pro files are scanned
678skip_project_generation_patch() { 694skip_project_generation() {
679 # Exit the script early by throwing in an exit before all of the .pro files are scanned 695 # Exit the script early by throwing in an exit before all of the .pro files are scanned
680 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 696 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
681 -i "${S}"/configure || die "Sed failed" 697 -i "${S}"/configure || die "sed failed"
682} 698}
683 699
684# @FUNCTION: symlink_binaries_to_buildtree 700# @FUNCTION: symlink_binaries_to_buildtree
685# @DESCRIPTION: 701# @DESCRIPTION:
686# Symlink generated binaries to buildtree so they can be used during compilation 702# Symlink generated binaries to buildtree so they can be used during compilation
687# time 703# time
688symlink_binaries_to_buildtree() { 704symlink_binaries_to_buildtree() {
689 for bin in qmake moc uic rcc; do 705 for bin in qmake moc uic rcc; do
690 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 706 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
691 done 707 done
692} 708}
693 709
694# @FUNCTION: fix_library_files 710# @FUNCTION: fix_library_files
695# @DESCRIPTION: 711# @DESCRIPTION:
696# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 712# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
697# moves the *.pc-files into the pkgconfig directory 713# moves the *.pc-files into the pkgconfig directory
698fix_library_files() { 714fix_library_files() {
699 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 715 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
700 if [[ -e ${libfile} ]]; then 716 if [[ -e ${libfile} ]]; then
701 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 717 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
702 fi 718 fi
703 done 719 done
704 720
705 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 721 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
706 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 722 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
707 if [[ -e ${libfile} ]]; then 723 if [[ -e ${libfile} ]]; then
708 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 724 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
709 725
710 # Move .pc files into the pkgconfig directory 726 # Move .pc files into the pkgconfig directory
711 dodir ${QTPCDIR#${EPREFIX}} 727 dodir ${QTPCDIR#${EPREFIX}}
712 mv ${libfile} "${D}"/${QTPCDIR}/ \ 728 mv ${libfile} "${D}"/${QTPCDIR}/ \
713 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 729 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
714 fi 730 fi
715 done 731 done
716 732
717 # Don't install an empty directory 733 # Don't install an empty directory
718 rmdir "${D}"/${QTLIBDIR}/pkgconfig 734 rmdir "${D}"/${QTLIBDIR}/pkgconfig
767 *-solaris*) 783 *-solaris*)
768 spec=solaris ;; 784 spec=solaris ;;
769 *-linux-*|*-linux) 785 *-linux-*|*-linux)
770 spec=linux ;; 786 spec=linux ;;
771 *) 787 *)
772 die "Unknown CHOST, no platform choosen." 788 die "Unknown CHOST, no platform chosen"
773 esac 789 esac
774 790
775 CXX=$(tc-getCXX) 791 CXX=$(tc-getCXX)
776 if [[ ${CXX} == *g++* ]]; then 792 if [[ ${CXX} == *g++* ]]; then
777 spec+=-g++ 793 spec+=-g++
778 elif [[ ${CXX} == *icpc* ]]; then 794 elif [[ ${CXX} == *icpc* ]]; then
779 spec+=-icc 795 spec+=-icc
780 else 796 else
781 die "Unknown compiler ${CXX}." 797 die "Unknown compiler '${CXX}'"
782 fi 798 fi
783 if [[ -n ${LIBDIR/lib} ]]; then 799 if [[ -n ${LIBDIR/lib} ]]; then
784 spec+=-${LIBDIR/lib} 800 spec+=-${LIBDIR/lib}
785 fi 801 fi
786 802
798} 814}
799 815
800# @FUNCTION: qt_assistant_cleanup 816# @FUNCTION: qt_assistant_cleanup
801# @RETURN: nothing 817# @RETURN: nothing
802# @DESCRIPTION: 818# @DESCRIPTION:
803# Tries to clean up tools.pro for qt-assistant ebuilds 819# Tries to clean up tools.pro for qt-assistant ebuilds.
804# Meant to be called in src_prepare 820# Meant to be called in src_prepare().
821# Since Qt 4.7.4 this function is a no-op.
805qt_assistant_cleanup() { 822qt_assistant_cleanup() {
823 # apply patching to qt-assistant ebuilds only
824 [[ ${PN} != "qt-assistant" ]] && return
825
826 # no longer needed for 4.7.4 and later
827 version_is_at_least "4.7.4" && return
828
806 # different versions (and branches...) may need different handling, 829 # different versions (and branches...) may need different handling,
807 # add a case if you need special handling 830 # add a case if you need special handling
808 case "${MY_PV_EXTRA}" in 831 case "${MY_PV_EXTRA}" in
809 *kde-qt*) 832 *kde-qt*)
810 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 833 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
823# @FUNCTION: qt_nolibx11 846# @FUNCTION: qt_nolibx11
824# @RETURN: nothing 847# @RETURN: nothing
825# @DESCRIPTION: 848# @DESCRIPTION:
826# Ignore X11 tests for packages that don't need X libraries installed 849# Ignore X11 tests for packages that don't need X libraries installed
827qt_nolibx11() { 850qt_nolibx11() {
828 einfo "removing X11 check to allow X-less compilation" 851 einfo "Removing X11 check to allow X-less compilation"
829 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 852 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
830 die "x11 check sed failed" 853 die "x11 check sed failed"
831} 854}
832 855
833EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 856EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.93  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20