/[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.92 Revision 1.99
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.92 2011/08/13 11:31:03 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.99 2011/11/19 20:00:35 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 15if version_is_at_least 4.5.99999999; then
19 MY_P=qt-everywhere-opensource-src-${MY_PV} 16 MY_P=qt-everywhere-opensource-src-${MY_PV}
20 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 17 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
21 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 18 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
22 IUSE="+exceptions" 19 IUSE="+exceptions"
23else 20else
24 MY_P=qt-x11-opensource-src-${MY_PV} 21 MY_P=qt-x11-opensource-src-${MY_PV}
22fi
23
24if version_is_at_least 4.7.99999999; then
25 IUSE+=" c++0x qpa"
25fi 26fi
26 27
27HOMEPAGE="http://qt.nokia.com/" 28HOMEPAGE="http://qt.nokia.com/"
28SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" 29SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
29 30
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)
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 has c++0x ${IUSE//+} && use 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
355 377
356 prepare_directories ${QT4_TARGET_DIRECTORIES} 378 prepare_directories ${QT4_TARGET_DIRECTORIES}
357} 379}
358 380
359# @FUNCTION: qt4-build_src_compile 381# @FUNCTION: qt4-build_src_compile
382# @DESCRIPTION:
360# @DESCRIPTION: Actual compile phase 383# Actual compile phase
361qt4-build_src_compile() { 384qt4-build_src_compile() {
362 setqtenv 385 setqtenv
363 386
364 build_directories ${QT4_TARGET_DIRECTORIES} 387 build_directories ${QT4_TARGET_DIRECTORIES}
365} 388}
403# @DESCRIPTION: 426# @DESCRIPTION:
404# Perform the actual installation including some library fixes. 427# Perform the actual installation including some library fixes.
405qt4-build_src_install() { 428qt4-build_src_install() {
406 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 429 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
407 setqtenv 430 setqtenv
431
408 install_directories ${QT4_TARGET_DIRECTORIES} 432 install_directories ${QT4_TARGET_DIRECTORIES}
409 install_qconfigs 433 install_qconfigs
410 fix_library_files 434 fix_library_files
411 fix_includes 435 fix_includes
436
412 # remove .la files since we are building only shared Qt libraries 437 # remove .la files since we are building only shared Qt libraries
413 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 438 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
414} 439}
415 440
416# @FUNCTION: setqtenv 441# @FUNCTION: setqtenv
417setqtenv() { 442setqtenv() {
418 # Set up installation directories 443 # Set up installation directories
512# @DESCRIPTION: 537# @DESCRIPTION:
513# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 538# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
514prepare_directories() { 539prepare_directories() {
515 for x in "$@"; do 540 for x in "$@"; do
516 pushd "${S}"/${x} >/dev/null 541 pushd "${S}"/${x} >/dev/null
517 einfo "running qmake in: $x" 542 einfo "Running qmake in: ${x}"
518 # avoid running over the maximum argument number, bug #299810 543 # avoid running over the maximum argument number, bug #299810
519 { 544 {
520 echo "${S}"/mkspecs/common/*.conf 545 echo "${S}"/mkspecs/common/*.conf
521 find "${S}" -name '*.pr[io]' 546 find "${S}" -name '*.pr[io]'
522 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 547 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
566# @DESCRIPTION: 591# @DESCRIPTION:
567# List variables that should be defined at the top of QtCore/qconfig.h 592# List variables that should be defined at the top of QtCore/qconfig.h
568: ${QCONFIG_DEFINE:=} 593: ${QCONFIG_DEFINE:=}
569 594
570# @FUNCTION: install_qconfigs 595# @FUNCTION: install_qconfigs
596# @DESCRIPTION:
571# @DESCRIPTION: Install gentoo-specific mkspecs configurations 597# Install gentoo-specific mkspecs configurations
572install_qconfigs() { 598install_qconfigs() {
573 local x 599 local x
574 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 600 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
575 for x in QCONFIG_ADD QCONFIG_REMOVE; do 601 for x in QCONFIG_ADD QCONFIG_REMOVE; do
576 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 602 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
587 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 613 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
588 fi 614 fi
589} 615}
590 616
591# @FUNCTION: generate_qconfigs 617# @FUNCTION: generate_qconfigs
618# @DESCRIPTION:
592# @DESCRIPTION: Generates gentoo-specific configurations 619# Generates gentoo-specific configurations
593generate_qconfigs() { 620generate_qconfigs() {
594 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 621 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
595 local x qconfig_add qconfig_remove qconfig_new 622 local x qconfig_add qconfig_remove qconfig_new
596 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 623 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
597 [[ -f ${x} ]] || continue 624 [[ -f ${x} ]] || continue
645 fi 672 fi
646 fi 673 fi
647} 674}
648 675
649# @FUNCTION: qt4-build_pkg_postrm 676# @FUNCTION: qt4-build_pkg_postrm
677# @DESCRIPTION:
650# @DESCRIPTION: Generate configurations when the package is completely removed 678# Generate configurations when the package is completely removed
651qt4-build_pkg_postrm() { 679qt4-build_pkg_postrm() {
652 generate_qconfigs 680 generate_qconfigs
653} 681}
654 682
655# @FUNCTION: qt4-build_pkg_postinst 683# @FUNCTION: qt4-build_pkg_postinst
684# @DESCRIPTION:
656# @DESCRIPTION: Generate configuration, plus throws a message about possible 685# Generate configuration, plus throws a message about possible
657# breakages and proposed solutions. 686# breakages and proposed solutions.
658qt4-build_pkg_postinst() { 687qt4-build_pkg_postinst() {
659 generate_qconfigs 688 generate_qconfigs
660} 689}
661 690
662# @FUNCTION: skip_qmake_build_patch 691# @FUNCTION: skip_qmake_build_patch
663# @DESCRIPTION: 692# @DESCRIPTION:
664# Don't need to build qmake, as it's already installed from qt-core 693# Don't need to build qmake, as it's already installed from qt-core
665skip_qmake_build_patch() { 694skip_qmake_build_patch() {
666 # Don't need to build qmake, as it's already installed from qt-core 695 # Don't need to build qmake, as it's already installed from qt-core
667 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 696 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
668} 697}
669 698
670# @FUNCTION: skip_project_generation_patch 699# @FUNCTION: skip_project_generation_patch
671# @DESCRIPTION: 700# @DESCRIPTION:
672# Exit the script early by throwing in an exit before all of the .pro files are scanned 701# Exit the script early by throwing in an exit before all of the .pro files are scanned
673skip_project_generation_patch() { 702skip_project_generation_patch() {
674 # Exit the script early by throwing in an exit before all of the .pro files are scanned 703 # Exit the script early by throwing in an exit before all of the .pro files are scanned
675 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 704 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
676 -i "${S}"/configure || die "Sed failed" 705 -i "${S}"/configure || die "sed failed"
677} 706}
678 707
679# @FUNCTION: symlink_binaries_to_buildtree 708# @FUNCTION: symlink_binaries_to_buildtree
680# @DESCRIPTION: 709# @DESCRIPTION:
681# Symlink generated binaries to buildtree so they can be used during compilation 710# Symlink generated binaries to buildtree so they can be used during compilation
682# time 711# time
683symlink_binaries_to_buildtree() { 712symlink_binaries_to_buildtree() {
684 for bin in qmake moc uic rcc; do 713 for bin in qmake moc uic rcc; do
685 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 714 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
686 done 715 done
687} 716}
688 717
689# @FUNCTION: fix_library_files 718# @FUNCTION: fix_library_files
690# @DESCRIPTION: 719# @DESCRIPTION:
691# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 720# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
692# moves the *.pc-files into the pkgconfig directory 721# moves the *.pc-files into the pkgconfig directory
693fix_library_files() { 722fix_library_files() {
694 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 723 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
695 if [[ -e ${libfile} ]]; then 724 if [[ -e ${libfile} ]]; then
696 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 725 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
697 fi 726 fi
698 done 727 done
699 728
700 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 729 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
701 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 730 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
702 if [[ -e ${libfile} ]]; then 731 if [[ -e ${libfile} ]]; then
703 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 732 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
704 733
705 # Move .pc files into the pkgconfig directory 734 # Move .pc files into the pkgconfig directory
706 dodir ${QTPCDIR#${EPREFIX}} 735 dodir ${QTPCDIR#${EPREFIX}}
707 mv ${libfile} "${D}"/${QTPCDIR}/ \ 736 mv ${libfile} "${D}"/${QTPCDIR}/ \
708 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 737 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
709 fi 738 fi
710 done 739 done
711 740
712 # Don't install an empty directory 741 # Don't install an empty directory
713 rmdir "${D}"/${QTLIBDIR}/pkgconfig 742 rmdir "${D}"/${QTLIBDIR}/pkgconfig
762 *-solaris*) 791 *-solaris*)
763 spec=solaris ;; 792 spec=solaris ;;
764 *-linux-*|*-linux) 793 *-linux-*|*-linux)
765 spec=linux ;; 794 spec=linux ;;
766 *) 795 *)
767 die "Unknown CHOST, no platform choosen." 796 die "Unknown CHOST, no platform chosen."
768 esac 797 esac
769 798
770 CXX=$(tc-getCXX) 799 CXX=$(tc-getCXX)
771 if [[ ${CXX} == *g++* ]]; then 800 if [[ ${CXX} == *g++* ]]; then
772 spec+=-g++ 801 spec+=-g++
773 elif [[ ${CXX} == *icpc* ]]; then 802 elif [[ ${CXX} == *icpc* ]]; then
774 spec+=-icc 803 spec+=-icc
775 else 804 else
776 die "Unknown compiler ${CXX}." 805 die "Unknown compiler '${CXX}'."
777 fi 806 fi
778 if [[ -n ${LIBDIR/lib} ]]; then 807 if [[ -n ${LIBDIR/lib} ]]; then
779 spec+=-${LIBDIR/lib} 808 spec+=-${LIBDIR/lib}
780 fi 809 fi
781 810
793} 822}
794 823
795# @FUNCTION: qt_assistant_cleanup 824# @FUNCTION: qt_assistant_cleanup
796# @RETURN: nothing 825# @RETURN: nothing
797# @DESCRIPTION: 826# @DESCRIPTION:
798# Tries to clean up tools.pro for qt-assistant ebuilds 827# Tries to clean up tools.pro for qt-assistant ebuilds.
799# Meant to be called in src_prepare 828# Meant to be called in src_prepare().
829# Since Qt 4.7.4 this function is a no-op.
800qt_assistant_cleanup() { 830qt_assistant_cleanup() {
831 # apply patching to qt-assistant ebuilds only
832 [[ ${PN} != "qt-assistant" ]] && return
833
834 # no longer needed for 4.7.4 and later
835 version_is_at_least "4.7.4" && return
836
801 # different versions (and branches...) may need different handling, 837 # different versions (and branches...) may need different handling,
802 # add a case if you need special handling 838 # add a case if you need special handling
803 case "${MY_PV_EXTRA}" in 839 case "${MY_PV_EXTRA}" in
804 *kde-qt*) 840 *kde-qt*)
805 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 841 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
818# @FUNCTION: qt_nolibx11 854# @FUNCTION: qt_nolibx11
819# @RETURN: nothing 855# @RETURN: nothing
820# @DESCRIPTION: 856# @DESCRIPTION:
821# Ignore X11 tests for packages that don't need X libraries installed 857# Ignore X11 tests for packages that don't need X libraries installed
822qt_nolibx11() { 858qt_nolibx11() {
823 einfo "removing X11 check to allow X-less compilation" 859 einfo "Removing X11 check to allow X-less compilation"
824 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 860 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
825 die "x11 check sed failed" 861 die "x11 check sed failed"
826} 862}
827 863
828EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 864EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.99

  ViewVC Help
Powered by ViewVC 1.1.20