/[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.94 Revision 1.100
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.94 2011/08/29 01:28:10 vapier 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."
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}" 140 local unpack_p="${MY_P}"
141 case "${PV}" in 141 case "${PV}" in
142 4.8.0_beta*) 142 4.8.0_*)
143 unpack_p="qt-everywhere-opensource-src-${PV/_*}" 143 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
144 ;; 144 ;;
145 esac 145 esac
146 local target targets= 146 local target targets=
147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
151 done 151 done
152 152
153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
154 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 154 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
155 case "${PV}" in 155 case "${PV}" in
156 4.8.0_beta*) 156 4.8.0_*)
157 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \ 157 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
158 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV} 158 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
159 ;; 159 ;;
160 esac 160 esac
161} 161}
181 if version_is_at_least "4.7.0_beta1"; then 181 if version_is_at_least "4.7.0_beta1"; then
182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
183 -i config.tests/unix/fvisibility.test || 183 -i config.tests/unix/fvisibility.test ||
184 die "visibility fixing sed failed" 184 die "visibility fixing sed failed"
185 fi 185 fi
186
187 if version_is_at_least "4.7"; then
186 # fix libx11 dependency on non X packages 188 # 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" 189 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
189 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 190 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
190 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 191
192 qt_assistant_cleanup
191 fi 193 fi
192 194
193 if use aqua; then 195 if use aqua; then
194 # provide a proper macx-g++-64 196 # provide a proper macx-g++-64
195 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 197 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
198 -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:' \
199 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 201 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
200 fi 202 fi
201 203
202 if [[ ${PN} != qt-core ]]; then 204 if [[ ${PN} != qt-core ]]; then
203 skip_qmake_build_patch 205 skip_qmake_build
204 skip_project_generation_patch 206 skip_project_generation
205 symlink_binaries_to_buildtree 207 symlink_binaries_to_buildtree
206 fi 208 fi
207 209
208 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 210 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
209 # qmake bus errors with -O2 but -O3 works 211 # qmake bus errors with -O2 but -O3 works
212 214
213 # Bug 178652 215 # Bug 178652
214 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 216 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
215 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 217 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
216 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
217 fi 228 fi
218 229
219 # Unsupported old gcc versions - hardened needs this :( 230 # Unsupported old gcc versions - hardened needs this :(
220 if [[ $(gcc-major-version) -lt 4 ]] ; then 231 if [[ $(gcc-major-version) -lt 4 ]] ; then
221 ewarn "Appending -fno-stack-protector to CXXFLAGS" 232 ewarn "Appending -fno-stack-protector to CXXFLAGS"
232 fi 243 fi
233 244
234 # Bug 282984 && Bug 295530 245 # Bug 282984 && Bug 295530
235 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:" \
236 -i configure || die "sed qmake compilers failed" 247 -i configure || die "sed qmake compilers failed"
248
237 # bug 321335 249 # Bug 321335
238 if version_is_at_least 4.6; then 250 if version_is_at_least 4.6; then
239 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 '{}' \; | \
240 xargs -0 \ 252 xargs -0 \
241 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" \
242 -i || die "sed test compilers failed" 254 -i || die "sed test compilers failed"
312 # 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
313 # Darwin, for which the sources already cater for -liconv 325 # Darwin, for which the sources already cater for -liconv
314 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 326 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
315 myconf+=" -liconv" 327 myconf+=" -liconv"
316 328
317 if has glib ${IUSE//+} && use glib; then 329 if use_if_iuse glib; then
318 # use -I, -L and -l from configure 330 # use -I, -L and -l from configure
319 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)"
320 # avoid the -pthread argument 332 # avoid the -pthread argument
321 myconf+=" ${glibflags//-pthread}" 333 myconf+=" ${glibflags//-pthread}"
322 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"
323 fi 344 fi
324 345
325 if use aqua ; then 346 if use aqua ; then
326 # On (snow) leopard use the new (frameworked) cocoa code. 347 # On (snow) leopard use the new (frameworked) cocoa code.
327 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 348 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
404# @DESCRIPTION: 425# @DESCRIPTION:
405# Perform the actual installation including some library fixes. 426# Perform the actual installation including some library fixes.
406qt4-build_src_install() { 427qt4-build_src_install() {
407 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
408 setqtenv 429 setqtenv
430
409 install_directories ${QT4_TARGET_DIRECTORIES} 431 install_directories ${QT4_TARGET_DIRECTORIES}
410 install_qconfigs 432 install_qconfigs
411 fix_library_files 433 fix_library_files
412 fix_includes 434 fix_includes
435
413 # remove .la files since we are building only shared Qt libraries 436 # remove .la files since we are building only shared Qt libraries
414 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 437 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
415} 438}
416 439
417# @FUNCTION: setqtenv 440# @FUNCTION: setqtenv
475 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 498 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
476 hppa|sh) myconf+=" -arch generic" ;; 499 hppa|sh) myconf+=" -arch generic" ;;
477 *) 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." ;;
478 esac 501 esac
479 502
480 # 4.5: build everything but qt-xmlpatterns w/o exceptions
481 # 4.6: exceptions USE flag 503 # exceptions USE flag
482 local exceptions="-exceptions" 504 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)" 505 in_iuse exceptions && exceptions="$(qt_use exceptions)"
489 ;;
490 esac
491 506
492 # note about -reduce-relocations: 507 # note about -reduce-relocations:
493 # That flag seems to introduce major breakage to applications, 508 # That flag seems to introduce major breakage to applications,
494 # 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
495 # construct a QApplication before a QPaintDevice" on Solaris 510 # construct a QApplication before a QPaintDevice" on Solaris
513# @DESCRIPTION: 528# @DESCRIPTION:
514# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 529# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
515prepare_directories() { 530prepare_directories() {
516 for x in "$@"; do 531 for x in "$@"; do
517 pushd "${S}"/${x} >/dev/null 532 pushd "${S}"/${x} >/dev/null
518 einfo "running qmake in: $x" 533 einfo "Running qmake in: ${x}"
519 # avoid running over the maximum argument number, bug #299810 534 # avoid running over the maximum argument number, bug #299810
520 { 535 {
521 echo "${S}"/mkspecs/common/*.conf 536 echo "${S}"/mkspecs/common/*.conf
522 find "${S}" -name '*.pr[io]' 537 find "${S}" -name '*.pr[io]'
523 } | 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
662# breakages and proposed solutions. 677# breakages and proposed solutions.
663qt4-build_pkg_postinst() { 678qt4-build_pkg_postinst() {
664 generate_qconfigs 679 generate_qconfigs
665} 680}
666 681
667# @FUNCTION: skip_qmake_build_patch 682# @FUNCTION: skip_qmake_build
668# @DESCRIPTION: 683# @DESCRIPTION:
669# 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
670skip_qmake_build_patch() { 685skip_qmake_build() {
671 # 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
672 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"
673} 688}
674 689
675# @FUNCTION: skip_project_generation_patch 690# @FUNCTION: skip_project_generation
676# @DESCRIPTION: 691# @DESCRIPTION:
677# 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
678skip_project_generation_patch() { 693skip_project_generation() {
679 # 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
680 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 695 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
681 -i "${S}"/configure || die "Sed failed" 696 -i "${S}"/configure || die "sed failed"
682} 697}
683 698
684# @FUNCTION: symlink_binaries_to_buildtree 699# @FUNCTION: symlink_binaries_to_buildtree
685# @DESCRIPTION: 700# @DESCRIPTION:
686# 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
687# time 702# time
688symlink_binaries_to_buildtree() { 703symlink_binaries_to_buildtree() {
689 for bin in qmake moc uic rcc; do 704 for bin in qmake moc uic rcc; do
690 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"
691 done 706 done
692} 707}
693 708
694# @FUNCTION: fix_library_files 709# @FUNCTION: fix_library_files
695# @DESCRIPTION: 710# @DESCRIPTION:
696# 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
697# moves the *.pc-files into the pkgconfig directory 712# moves the *.pc-files into the pkgconfig directory
698fix_library_files() { 713fix_library_files() {
699 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 714 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
700 if [[ -e ${libfile} ]]; then 715 if [[ -e ${libfile} ]]; then
701 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"
702 fi 717 fi
703 done 718 done
704 719
705 # 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:
706 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 721 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
707 if [[ -e ${libfile} ]]; then 722 if [[ -e ${libfile} ]]; then
708 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"
709 724
710 # Move .pc files into the pkgconfig directory 725 # Move .pc files into the pkgconfig directory
711 dodir ${QTPCDIR#${EPREFIX}} 726 dodir ${QTPCDIR#${EPREFIX}}
712 mv ${libfile} "${D}"/${QTPCDIR}/ \ 727 mv ${libfile} "${D}"/${QTPCDIR}/ \
713 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 728 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
714 fi 729 fi
715 done 730 done
716 731
717 # Don't install an empty directory 732 # Don't install an empty directory
718 rmdir "${D}"/${QTLIBDIR}/pkgconfig 733 rmdir "${D}"/${QTLIBDIR}/pkgconfig
767 *-solaris*) 782 *-solaris*)
768 spec=solaris ;; 783 spec=solaris ;;
769 *-linux-*|*-linux) 784 *-linux-*|*-linux)
770 spec=linux ;; 785 spec=linux ;;
771 *) 786 *)
772 die "Unknown CHOST, no platform choosen." 787 die "Unknown CHOST, no platform chosen"
773 esac 788 esac
774 789
775 CXX=$(tc-getCXX) 790 CXX=$(tc-getCXX)
776 if [[ ${CXX} == *g++* ]]; then 791 if [[ ${CXX} == *g++* ]]; then
777 spec+=-g++ 792 spec+=-g++
778 elif [[ ${CXX} == *icpc* ]]; then 793 elif [[ ${CXX} == *icpc* ]]; then
779 spec+=-icc 794 spec+=-icc
780 else 795 else
781 die "Unknown compiler ${CXX}." 796 die "Unknown compiler '${CXX}'"
782 fi 797 fi
783 if [[ -n ${LIBDIR/lib} ]]; then 798 if [[ -n ${LIBDIR/lib} ]]; then
784 spec+=-${LIBDIR/lib} 799 spec+=-${LIBDIR/lib}
785 fi 800 fi
786 801
798} 813}
799 814
800# @FUNCTION: qt_assistant_cleanup 815# @FUNCTION: qt_assistant_cleanup
801# @RETURN: nothing 816# @RETURN: nothing
802# @DESCRIPTION: 817# @DESCRIPTION:
803# Tries to clean up tools.pro for qt-assistant ebuilds 818# Tries to clean up tools.pro for qt-assistant ebuilds.
804# 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.
805qt_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
806 # different versions (and branches...) may need different handling, 828 # different versions (and branches...) may need different handling,
807 # add a case if you need special handling 829 # add a case if you need special handling
808 case "${MY_PV_EXTRA}" in 830 case "${MY_PV_EXTRA}" in
809 *kde-qt*) 831 *kde-qt*)
810 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 832 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
823# @FUNCTION: qt_nolibx11 845# @FUNCTION: qt_nolibx11
824# @RETURN: nothing 846# @RETURN: nothing
825# @DESCRIPTION: 847# @DESCRIPTION:
826# 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
827qt_nolibx11() { 849qt_nolibx11() {
828 einfo "removing X11 check to allow X-less compilation" 850 einfo "Removing X11 check to allow X-less compilation"
829 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 ||
830 die "x11 check sed failed" 852 die "x11 check sed failed"
831} 853}
832 854
833EXPORT_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.94  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20