/[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.91 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.91 2011/07/08 11:35:01 ssuominen 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."
135# @FUNCTION: qt4-build_src_unpack 136# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION: 137# @DESCRIPTION:
137# Unpacks the sources 138# Unpacks the sources
138qt4-build_src_unpack() { 139qt4-build_src_unpack() {
139 setqtenv 140 setqtenv
141 local unpack_p="${MY_P}"
142 case "${PV}" in
143 4.8.0_*)
144 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
145 ;;
146 esac
140 local target targets= 147 local target targets=
141 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 148 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
142 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 149 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
143 ${QT4_EXTRACT_DIRECTORIES}; do 150 ${QT4_EXTRACT_DIRECTORIES}; do
144 targets+=" ${MY_P}/${target}" 151 targets+=" ${unpack_p}/${target}"
145 done 152 done
146 153
147 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 154 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
148 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 155 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
156 case "${PV}" in
157 4.8.0_*)
158 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
159 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
160 ;;
161 esac
149} 162}
150 163
151# @ECLASS-VARIABLE: PATCHES 164# @ECLASS-VARIABLE: PATCHES
152# @DESCRIPTION: 165# @DESCRIPTION:
153# In case you have patches to apply, specify them in PATCHES variable. Make sure 166# 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 175# 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. 176# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
164qt4-build_src_prepare() { 177qt4-build_src_prepare() {
165 setqtenv 178 setqtenv
166 cd "${S}" 179 cd "${S}"
167 180
168 # fix qt 4.7 regression that skips -fvisibility=hidden 181 # fix qt 4.7 regression that skips -fvisibility=hidden
169 if version_is_at_least "4.7.0_beta1"; then 182 if version_is_at_least "4.7.0_beta1"; then
170 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 183 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
171 -i config.tests/unix/fvisibility.test || 184 -i config.tests/unix/fvisibility.test ||
172 die "visibility fixing sed failed" 185 die "visibility fixing sed failed"
173 fi 186 fi
187
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 189 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" 190 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
177 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 191 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
178 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 192 [[ ${PN} == "qt-assistant" ]] && 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
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 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
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
500# @DESCRIPTION: 536# @DESCRIPTION:
501# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 537# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
502prepare_directories() { 538prepare_directories() {
503 for x in "$@"; do 539 for x in "$@"; do
504 pushd "${S}"/${x} >/dev/null 540 pushd "${S}"/${x} >/dev/null
505 einfo "running qmake in: $x" 541 einfo "Running qmake in: ${x}"
506 # avoid running over the maximum argument number, bug #299810 542 # avoid running over the maximum argument number, bug #299810
507 { 543 {
508 echo "${S}"/mkspecs/common/*.conf 544 echo "${S}"/mkspecs/common/*.conf
509 find "${S}" -name '*.pr[io]' 545 find "${S}" -name '*.pr[io]'
510 } | 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
554# @DESCRIPTION: 590# @DESCRIPTION:
555# 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
556: ${QCONFIG_DEFINE:=} 592: ${QCONFIG_DEFINE:=}
557 593
558# @FUNCTION: install_qconfigs 594# @FUNCTION: install_qconfigs
595# @DESCRIPTION:
559# @DESCRIPTION: Install gentoo-specific mkspecs configurations 596# Install gentoo-specific mkspecs configurations
560install_qconfigs() { 597install_qconfigs() {
561 local x 598 local x
562 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 599 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
563 for x in QCONFIG_ADD QCONFIG_REMOVE; do 600 for x in QCONFIG_ADD QCONFIG_REMOVE; do
564 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 601 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
575 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"
576 fi 613 fi
577} 614}
578 615
579# @FUNCTION: generate_qconfigs 616# @FUNCTION: generate_qconfigs
617# @DESCRIPTION:
580# @DESCRIPTION: Generates gentoo-specific configurations 618# Generates gentoo-specific configurations
581generate_qconfigs() { 619generate_qconfigs() {
582 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
583 local x qconfig_add qconfig_remove qconfig_new 621 local x qconfig_add qconfig_remove qconfig_new
584 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 622 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
585 [[ -f ${x} ]] || continue 623 [[ -f ${x} ]] || continue
633 fi 671 fi
634 fi 672 fi
635} 673}
636 674
637# @FUNCTION: qt4-build_pkg_postrm 675# @FUNCTION: qt4-build_pkg_postrm
676# @DESCRIPTION:
638# @DESCRIPTION: Generate configurations when the package is completely removed 677# Generate configurations when the package is completely removed
639qt4-build_pkg_postrm() { 678qt4-build_pkg_postrm() {
640 generate_qconfigs 679 generate_qconfigs
641} 680}
642 681
643# @FUNCTION: qt4-build_pkg_postinst 682# @FUNCTION: qt4-build_pkg_postinst
683# @DESCRIPTION:
644# @DESCRIPTION: Generate configuration, plus throws a message about possible 684# Generate configuration, plus throws a message about possible
645# breakages and proposed solutions. 685# breakages and proposed solutions.
646qt4-build_pkg_postinst() { 686qt4-build_pkg_postinst() {
647 generate_qconfigs 687 generate_qconfigs
648} 688}
649 689
650# @FUNCTION: skip_qmake_build_patch 690# @FUNCTION: skip_qmake_build_patch
651# @DESCRIPTION: 691# @DESCRIPTION:
652# 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
653skip_qmake_build_patch() { 693skip_qmake_build_patch() {
654 # 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
655 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"
656} 696}
657 697
658# @FUNCTION: skip_project_generation_patch 698# @FUNCTION: skip_project_generation_patch
659# @DESCRIPTION: 699# @DESCRIPTION:
660# 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
661skip_project_generation_patch() { 701skip_project_generation_patch() {
662 # 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
663 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 703 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
664 -i "${S}"/configure || die "Sed failed" 704 -i "${S}"/configure || die "sed failed"
665} 705}
666 706
667# @FUNCTION: symlink_binaries_to_buildtree 707# @FUNCTION: symlink_binaries_to_buildtree
668# @DESCRIPTION: 708# @DESCRIPTION:
669# 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
670# time 710# time
671symlink_binaries_to_buildtree() { 711symlink_binaries_to_buildtree() {
672 for bin in qmake moc uic rcc; do 712 for bin in qmake moc uic rcc; do
673 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"
674 done 714 done
675} 715}
676 716
677# @FUNCTION: fix_library_files 717# @FUNCTION: fix_library_files
678# @DESCRIPTION: 718# @DESCRIPTION:
679# 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
680# moves the *.pc-files into the pkgconfig directory 720# moves the *.pc-files into the pkgconfig directory
681fix_library_files() { 721fix_library_files() {
682 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 722 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
683 if [[ -e ${libfile} ]]; then 723 if [[ -e ${libfile} ]]; then
684 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"
685 fi 725 fi
686 done 726 done
687 727
688 # 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:
689 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 729 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
690 if [[ -e ${libfile} ]]; then 730 if [[ -e ${libfile} ]]; then
691 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"
692 732
693 # Move .pc files into the pkgconfig directory 733 # Move .pc files into the pkgconfig directory
694 dodir ${QTPCDIR#${EPREFIX}} 734 dodir ${QTPCDIR#${EPREFIX}}
695 mv ${libfile} "${D}"/${QTPCDIR}/ \ 735 mv ${libfile} "${D}"/${QTPCDIR}/ \
696 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 736 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
697 fi 737 fi
698 done 738 done
699 739
700 # Don't install an empty directory 740 # Don't install an empty directory
701 rmdir "${D}"/${QTLIBDIR}/pkgconfig 741 rmdir "${D}"/${QTLIBDIR}/pkgconfig
750 *-solaris*) 790 *-solaris*)
751 spec=solaris ;; 791 spec=solaris ;;
752 *-linux-*|*-linux) 792 *-linux-*|*-linux)
753 spec=linux ;; 793 spec=linux ;;
754 *) 794 *)
755 die "Unknown CHOST, no platform choosen." 795 die "Unknown CHOST, no platform chosen."
756 esac 796 esac
757 797
758 CXX=$(tc-getCXX) 798 CXX=$(tc-getCXX)
759 if [[ ${CXX} == *g++* ]]; then 799 if [[ ${CXX} == *g++* ]]; then
760 spec+=-g++ 800 spec+=-g++
761 elif [[ ${CXX} == *icpc* ]]; then 801 elif [[ ${CXX} == *icpc* ]]; then
762 spec+=-icc 802 spec+=-icc
763 else 803 else
764 die "Unknown compiler ${CXX}." 804 die "Unknown compiler '${CXX}'."
765 fi 805 fi
766 if [[ -n ${LIBDIR/lib} ]]; then 806 if [[ -n ${LIBDIR/lib} ]]; then
767 spec+=-${LIBDIR/lib} 807 spec+=-${LIBDIR/lib}
768 fi 808 fi
769 809
806# @FUNCTION: qt_nolibx11 846# @FUNCTION: qt_nolibx11
807# @RETURN: nothing 847# @RETURN: nothing
808# @DESCRIPTION: 848# @DESCRIPTION:
809# 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
810qt_nolibx11() { 850qt_nolibx11() {
811 einfo "removing X11 check to allow X-less compilation" 851 einfo "Removing X11 check to allow X-less compilation"
812 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 ||
813 die "x11 check sed failed" 853 die "x11 check sed failed"
814} 854}
815 855
816EXPORT_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.91  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20