/[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.98
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.98 2011/11/12 19:01:56 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
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 189 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 [[ ${PN} == "qt-assistant" ]] && 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
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 has c++0x ${IUSE//+} && use 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
355 376
356 prepare_directories ${QT4_TARGET_DIRECTORIES} 377 prepare_directories ${QT4_TARGET_DIRECTORIES}
357} 378}
358 379
359# @FUNCTION: qt4-build_src_compile 380# @FUNCTION: qt4-build_src_compile
381# @DESCRIPTION:
360# @DESCRIPTION: Actual compile phase 382# Actual compile phase
361qt4-build_src_compile() { 383qt4-build_src_compile() {
362 setqtenv 384 setqtenv
363 385
364 build_directories ${QT4_TARGET_DIRECTORIES} 386 build_directories ${QT4_TARGET_DIRECTORIES}
365} 387}
403# @DESCRIPTION: 425# @DESCRIPTION:
404# Perform the actual installation including some library fixes. 426# Perform the actual installation including some library fixes.
405qt4-build_src_install() { 427qt4-build_src_install() {
406 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
407 setqtenv 429 setqtenv
430
408 install_directories ${QT4_TARGET_DIRECTORIES} 431 install_directories ${QT4_TARGET_DIRECTORIES}
409 install_qconfigs 432 install_qconfigs
410 fix_library_files 433 fix_library_files
411 fix_includes 434 fix_includes
435
412 # remove .la files since we are building only shared Qt libraries 436 # remove .la files since we are building only shared Qt libraries
413 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 437 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
414} 438}
415 439
416# @FUNCTION: setqtenv 440# @FUNCTION: setqtenv
417setqtenv() { 441setqtenv() {
418 # Set up installation directories 442 # Set up installation directories
512# @DESCRIPTION: 536# @DESCRIPTION:
513# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 537# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
514prepare_directories() { 538prepare_directories() {
515 for x in "$@"; do 539 for x in "$@"; do
516 pushd "${S}"/${x} >/dev/null 540 pushd "${S}"/${x} >/dev/null
517 einfo "running qmake in: $x" 541 einfo "Running qmake in: ${x}"
518 # avoid running over the maximum argument number, bug #299810 542 # avoid running over the maximum argument number, bug #299810
519 { 543 {
520 echo "${S}"/mkspecs/common/*.conf 544 echo "${S}"/mkspecs/common/*.conf
521 find "${S}" -name '*.pr[io]' 545 find "${S}" -name '*.pr[io]'
522 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 546 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
566# @DESCRIPTION: 590# @DESCRIPTION:
567# List variables that should be defined at the top of QtCore/qconfig.h 591# List variables that should be defined at the top of QtCore/qconfig.h
568: ${QCONFIG_DEFINE:=} 592: ${QCONFIG_DEFINE:=}
569 593
570# @FUNCTION: install_qconfigs 594# @FUNCTION: install_qconfigs
595# @DESCRIPTION:
571# @DESCRIPTION: Install gentoo-specific mkspecs configurations 596# Install gentoo-specific mkspecs configurations
572install_qconfigs() { 597install_qconfigs() {
573 local x 598 local x
574 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 599 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
575 for x in QCONFIG_ADD QCONFIG_REMOVE; do 600 for x in QCONFIG_ADD QCONFIG_REMOVE; do
576 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 601 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
587 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 612 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
588 fi 613 fi
589} 614}
590 615
591# @FUNCTION: generate_qconfigs 616# @FUNCTION: generate_qconfigs
617# @DESCRIPTION:
592# @DESCRIPTION: Generates gentoo-specific configurations 618# Generates gentoo-specific configurations
593generate_qconfigs() { 619generate_qconfigs() {
594 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 620 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 621 local x qconfig_add qconfig_remove qconfig_new
596 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 622 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
597 [[ -f ${x} ]] || continue 623 [[ -f ${x} ]] || continue
645 fi 671 fi
646 fi 672 fi
647} 673}
648 674
649# @FUNCTION: qt4-build_pkg_postrm 675# @FUNCTION: qt4-build_pkg_postrm
676# @DESCRIPTION:
650# @DESCRIPTION: Generate configurations when the package is completely removed 677# Generate configurations when the package is completely removed
651qt4-build_pkg_postrm() { 678qt4-build_pkg_postrm() {
652 generate_qconfigs 679 generate_qconfigs
653} 680}
654 681
655# @FUNCTION: qt4-build_pkg_postinst 682# @FUNCTION: qt4-build_pkg_postinst
683# @DESCRIPTION:
656# @DESCRIPTION: Generate configuration, plus throws a message about possible 684# Generate configuration, plus throws a message about possible
657# breakages and proposed solutions. 685# breakages and proposed solutions.
658qt4-build_pkg_postinst() { 686qt4-build_pkg_postinst() {
659 generate_qconfigs 687 generate_qconfigs
660} 688}
661 689
662# @FUNCTION: skip_qmake_build_patch 690# @FUNCTION: skip_qmake_build_patch
663# @DESCRIPTION: 691# @DESCRIPTION:
664# Don't need to build qmake, as it's already installed from qt-core 692# Don't need to build qmake, as it's already installed from qt-core
665skip_qmake_build_patch() { 693skip_qmake_build_patch() {
666 # Don't need to build qmake, as it's already installed from qt-core 694 # 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" 695 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed"
668} 696}
669 697
670# @FUNCTION: skip_project_generation_patch 698# @FUNCTION: skip_project_generation_patch
671# @DESCRIPTION: 699# @DESCRIPTION:
672# Exit the script early by throwing in an exit before all of the .pro files are scanned 700# Exit the script early by throwing in an exit before all of the .pro files are scanned
673skip_project_generation_patch() { 701skip_project_generation_patch() {
674 # Exit the script early by throwing in an exit before all of the .pro files are scanned 702 # 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" \ 703 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
676 -i "${S}"/configure || die "Sed failed" 704 -i "${S}"/configure || die "sed failed"
677} 705}
678 706
679# @FUNCTION: symlink_binaries_to_buildtree 707# @FUNCTION: symlink_binaries_to_buildtree
680# @DESCRIPTION: 708# @DESCRIPTION:
681# Symlink generated binaries to buildtree so they can be used during compilation 709# Symlink generated binaries to buildtree so they can be used during compilation
682# time 710# time
683symlink_binaries_to_buildtree() { 711symlink_binaries_to_buildtree() {
684 for bin in qmake moc uic rcc; do 712 for bin in qmake moc uic rcc; do
685 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 713 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
686 done 714 done
687} 715}
688 716
689# @FUNCTION: fix_library_files 717# @FUNCTION: fix_library_files
690# @DESCRIPTION: 718# @DESCRIPTION:
691# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 719# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
692# moves the *.pc-files into the pkgconfig directory 720# moves the *.pc-files into the pkgconfig directory
693fix_library_files() { 721fix_library_files() {
694 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 722 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
695 if [[ -e ${libfile} ]]; then 723 if [[ -e ${libfile} ]]; then
696 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 724 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
697 fi 725 fi
698 done 726 done
699 727
700 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 728 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
701 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 729 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
702 if [[ -e ${libfile} ]]; then 730 if [[ -e ${libfile} ]]; then
703 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 731 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed"
704 732
705 # Move .pc files into the pkgconfig directory 733 # Move .pc files into the pkgconfig directory
706 dodir ${QTPCDIR#${EPREFIX}} 734 dodir ${QTPCDIR#${EPREFIX}}
707 mv ${libfile} "${D}"/${QTPCDIR}/ \ 735 mv ${libfile} "${D}"/${QTPCDIR}/ \
708 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 736 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
709 fi 737 fi
710 done 738 done
711 739
712 # Don't install an empty directory 740 # Don't install an empty directory
713 rmdir "${D}"/${QTLIBDIR}/pkgconfig 741 rmdir "${D}"/${QTLIBDIR}/pkgconfig
762 *-solaris*) 790 *-solaris*)
763 spec=solaris ;; 791 spec=solaris ;;
764 *-linux-*|*-linux) 792 *-linux-*|*-linux)
765 spec=linux ;; 793 spec=linux ;;
766 *) 794 *)
767 die "Unknown CHOST, no platform choosen." 795 die "Unknown CHOST, no platform chosen."
768 esac 796 esac
769 797
770 CXX=$(tc-getCXX) 798 CXX=$(tc-getCXX)
771 if [[ ${CXX} == *g++* ]]; then 799 if [[ ${CXX} == *g++* ]]; then
772 spec+=-g++ 800 spec+=-g++
773 elif [[ ${CXX} == *icpc* ]]; then 801 elif [[ ${CXX} == *icpc* ]]; then
774 spec+=-icc 802 spec+=-icc
775 else 803 else
776 die "Unknown compiler ${CXX}." 804 die "Unknown compiler '${CXX}'."
777 fi 805 fi
778 if [[ -n ${LIBDIR/lib} ]]; then 806 if [[ -n ${LIBDIR/lib} ]]; then
779 spec+=-${LIBDIR/lib} 807 spec+=-${LIBDIR/lib}
780 fi 808 fi
781 809
818# @FUNCTION: qt_nolibx11 846# @FUNCTION: qt_nolibx11
819# @RETURN: nothing 847# @RETURN: nothing
820# @DESCRIPTION: 848# @DESCRIPTION:
821# 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
822qt_nolibx11() { 850qt_nolibx11() {
823 einfo "removing X11 check to allow X-less compilation" 851 einfo "Removing X11 check to allow X-less compilation"
824 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 ||
825 die "x11 check sed failed" 853 die "x11 check sed failed"
826} 854}
827 855
828EXPORT_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.92  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20