/[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.97 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.97 2011/11/02 18:01:00 jer 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}
16
17HOMEPAGE="http://qt.nokia.com/"
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
24 MY_P=qt-x11-opensource-src-${MY_PV}
25fi
26 26
27if version_is_at_least 4.7.99999999; then 27if version_is_at_least 4.7.99999999; then
28 IUSE+=" c++0x qpa" 28 IUSE+=" c++0x qpa"
29fi 29fi
30
31HOMEPAGE="http://qt.nokia.com/"
32SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
33
34LICENSE="|| ( LGPL-2.1 GPL-3 )"
35IUSE+=" debug pch aqua"
36 30
37RDEPEND=" 31RDEPEND="
38 !<x11-libs/qt-assistant-${PV} 32 !<x11-libs/qt-assistant-${PV}
39 !>x11-libs/qt-assistant-${PV}-r9999 33 !>x11-libs/qt-assistant-${PV}-r9999
40 !<x11-libs/qt-core-${PV} 34 !<x11-libs/qt-core-${PV}
41 !>x11-libs/qt-core-${PV}-r9999 35 !>x11-libs/qt-core-${PV}-r9999
42 !<x11-libs/qt-dbus-${PV} 36 !<x11-libs/qt-dbus-${PV}
43 !>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
44 !<x11-libs/qt-demo-${PV} 40 !<x11-libs/qt-demo-${PV}
45 !>x11-libs/qt-demo-${PV}-r9999 41 !>x11-libs/qt-demo-${PV}-r9999
46 !<x11-libs/qt-gui-${PV} 42 !<x11-libs/qt-gui-${PV}
47 !>x11-libs/qt-gui-${PV}-r9999 43 !>x11-libs/qt-gui-${PV}-r9999
48 !<x11-libs/qt-multimedia-${PV} 44 !<x11-libs/qt-multimedia-${PV}
… …
75qt4-build_pkg_setup() { 71qt4-build_pkg_setup() {
76 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
77 73
78 # Protect users by not allowing downgrades between releases 74 # Protect users by not allowing downgrades between releases
79 # Downgrading revisions within the same release should be allowed 75 # Downgrading revisions within the same release should be allowed
80 if has_version '>'${CATEGORY}/${P}-r9999 ; then 76 if has_version '>'${CATEGORY}/${P}-r9999; then
81 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 77 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
82 eerror "Sanity check to keep you from breaking your system:" 78 eerror "Sanity check to keep you from breaking your system:"
83 eerror " Downgrading Qt is completely unsupported and will break your system!" 79 eerror " Downgrading Qt is completely unsupported and will break your system!"
84 die "aborting to save your system" 80 die "aborting to save your system"
85 else 81 else
86 ewarn "Downgrading Qt is completely unsupported and will break your system!" 82 ewarn "Downgrading Qt is completely unsupported and will break your system!"
87 fi 83 fi
88 fi 84 fi
89 85
90 if [[ "${PN}" == "qt-webkit" ]]; then 86 if [[ ${PN} == "qt-webkit" ]]; then
91 eshopts_push -s extglob 87 eshopts_push -s extglob
92 if is-flagq '-g?(gdb)?([1-9])'; then 88 if is-flagq '-g?(gdb)?([1-9])'; then
93 echo 89 echo
94 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)."
95 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."
… …
185 if version_is_at_least "4.7.0_beta1"; then 181 if version_is_at_least "4.7.0_beta1"; then
186 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
187 -i config.tests/unix/fvisibility.test || 183 -i config.tests/unix/fvisibility.test ||
188 die "visibility fixing sed failed" 184 die "visibility fixing sed failed"
189 fi 185 fi
186
187 if version_is_at_least "4.7"; then
190 # fix libx11 dependency on non X packages 188 # fix libX11 dependency on non X packages
191 if version_is_at_least "4.7.0_beta2"; then
192 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"
193 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 190 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
194 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 191
192 qt_assistant_cleanup
195 fi 193 fi
196 194
197 if use aqua; then 195 if use aqua; then
198 # provide a proper macx-g++-64 196 # provide a proper macx-g++-64
199 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 197 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
… …
202 -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:' \
203 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 201 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
204 fi 202 fi
205 203
206 if [[ ${PN} != qt-core ]]; then 204 if [[ ${PN} != qt-core ]]; then
207 skip_qmake_build_patch 205 skip_qmake_build
208 skip_project_generation_patch 206 skip_project_generation
209 symlink_binaries_to_buildtree 207 symlink_binaries_to_buildtree
210 fi 208 fi
211 209
212 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 210 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
213 # qmake bus errors with -O2 but -O3 works 211 # qmake bus errors with -O2 but -O3 works
… …
218 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 216 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
219 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 217 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
220 append-flags -fno-gcse 218 append-flags -fno-gcse
221 fi 219 fi
222 220
223 if has c++0x ${IUSE//+} && use c++0x; then 221 if use_if_iuse c++0x; then
224 ewarn "You are about to build Qt4 using the C++11 standard. Even though" 222 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
225 ewarn "this is an official standard, some of the reverse dependencies" 223 ewarn "this is an official standard, some of the reverse dependencies"
226 ewarn "may fail to compile or link againt the Qt4 libraries. Before" 224 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
227 ewarn "reporting a bug, make sure your bug is reproducible with c++0x" 225 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
228 ewarn "disabled." 226 ewarn "disabled."
229 append-flags -std=c++0x 227 append-flags -std=c++0x
230 fi 228 fi
229
231 # Unsupported old gcc versions - hardened needs this :( 230 # Unsupported old gcc versions - hardened needs this :(
232 if [[ $(gcc-major-version) -lt 4 ]] ; then 231 if [[ $(gcc-major-version) -lt 4 ]] ; then
233 ewarn "Appending -fno-stack-protector to CXXFLAGS" 232 ewarn "Appending -fno-stack-protector to CXXFLAGS"
234 append-cxxflags -fno-stack-protector 233 append-cxxflags -fno-stack-protector
235 # Bug 253127 234 # Bug 253127
… …
244 fi 243 fi
245 244
246 # Bug 282984 && Bug 295530 245 # Bug 282984 && Bug 295530
247 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:" \
248 -i configure || die "sed qmake compilers failed" 247 -i configure || die "sed qmake compilers failed"
248
249 # bug 321335 249 # Bug 321335
250 if version_is_at_least 4.6; then 250 if version_is_at_least 4.6; then
251 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 '{}' \; | \
252 xargs -0 \ 252 xargs -0 \
253 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" \
254 -i || die "sed test compilers failed" 254 -i || die "sed test compilers failed"
… …
324 # 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
325 # Darwin, for which the sources already cater for -liconv 325 # Darwin, for which the sources already cater for -liconv
326 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 326 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
327 myconf+=" -liconv" 327 myconf+=" -liconv"
328 328
329 if has glib ${IUSE//+} && use glib; then 329 if use_if_iuse glib; then
330 # use -I, -L and -l from configure 330 # use -I, -L and -l from configure
331 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)"
332 # avoid the -pthread argument 332 # avoid the -pthread argument
333 myconf+=" ${glibflags//-pthread}" 333 myconf+=" ${glibflags//-pthread}"
334 unset glibflags 334 unset glibflags
335 fi 335 fi
336 336
337 if has qpa ${IUSE//+} && use qpa; then 337 if use_if_iuse qpa; then
338 ewarn 338 ewarn
339 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" 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" 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." 341 ewarn "disable it before reporting any bugs related to this useflag."
342 ewarn 342 ewarn
… …
425# @DESCRIPTION: 425# @DESCRIPTION:
426# Perform the actual installation including some library fixes. 426# Perform the actual installation including some library fixes.
427qt4-build_src_install() { 427qt4-build_src_install() {
428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 428 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
429 setqtenv 429 setqtenv
430
430 install_directories ${QT4_TARGET_DIRECTORIES} 431 install_directories ${QT4_TARGET_DIRECTORIES}
431 install_qconfigs 432 install_qconfigs
432 fix_library_files 433 fix_library_files
433 fix_includes 434 fix_includes
435
434 # remove .la files since we are building only shared Qt libraries 436 # remove .la files since we are building only shared Qt libraries
435 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 437 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
436} 438}
437 439
438# @FUNCTION: setqtenv 440# @FUNCTION: setqtenv
… …
496 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 498 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
497 hppa|sh) myconf+=" -arch generic" ;; 499 hppa|sh) myconf+=" -arch generic" ;;
498 *) 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." ;;
499 esac 501 esac
500 502
501 # 4.5: build everything but qt-xmlpatterns w/o exceptions
502 # 4.6: exceptions USE flag 503 # exceptions USE flag
503 local exceptions="-exceptions" 504 local exceptions="-exceptions"
504 case "${PV}" in
505 4.5.*)
506 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
507 ;;
508 *)
509 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)" 505 in_iuse exceptions && exceptions="$(qt_use exceptions)"
510 ;;
511 esac
512 506
513 # note about -reduce-relocations: 507 # note about -reduce-relocations:
514 # That flag seems to introduce major breakage to applications, 508 # That flag seems to introduce major breakage to applications,
515 # 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
516 # construct a QApplication before a QPaintDevice" on Solaris 510 # construct a QApplication before a QPaintDevice" on Solaris
… …
534# @DESCRIPTION: 528# @DESCRIPTION:
535# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 529# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
536prepare_directories() { 530prepare_directories() {
537 for x in "$@"; do 531 for x in "$@"; do
538 pushd "${S}"/${x} >/dev/null 532 pushd "${S}"/${x} >/dev/null
539 einfo "running qmake in: $x" 533 einfo "Running qmake in: ${x}"
540 # avoid running over the maximum argument number, bug #299810 534 # avoid running over the maximum argument number, bug #299810
541 { 535 {
542 echo "${S}"/mkspecs/common/*.conf 536 echo "${S}"/mkspecs/common/*.conf
543 find "${S}" -name '*.pr[io]' 537 find "${S}" -name '*.pr[io]'
544 } | 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
… …
683# breakages and proposed solutions. 677# breakages and proposed solutions.
684qt4-build_pkg_postinst() { 678qt4-build_pkg_postinst() {
685 generate_qconfigs 679 generate_qconfigs
686} 680}
687 681
688# @FUNCTION: skip_qmake_build_patch 682# @FUNCTION: skip_qmake_build
689# @DESCRIPTION: 683# @DESCRIPTION:
690# 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
691skip_qmake_build_patch() { 685skip_qmake_build() {
692 # 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
693 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"
694} 688}
695 689
696# @FUNCTION: skip_project_generation_patch 690# @FUNCTION: skip_project_generation
697# @DESCRIPTION: 691# @DESCRIPTION:
698# 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
699skip_project_generation_patch() { 693skip_project_generation() {
700 # 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
701 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 695 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
702 -i "${S}"/configure || die "Sed failed" 696 -i "${S}"/configure || die "sed failed"
703} 697}
704 698
705# @FUNCTION: symlink_binaries_to_buildtree 699# @FUNCTION: symlink_binaries_to_buildtree
706# @DESCRIPTION: 700# @DESCRIPTION:
707# 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
708# time 702# time
709symlink_binaries_to_buildtree() { 703symlink_binaries_to_buildtree() {
710 for bin in qmake moc uic rcc; do 704 for bin in qmake moc uic rcc; do
711 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"
712 done 706 done
713} 707}
714 708
715# @FUNCTION: fix_library_files 709# @FUNCTION: fix_library_files
716# @DESCRIPTION: 710# @DESCRIPTION:
717# 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
718# moves the *.pc-files into the pkgconfig directory 712# moves the *.pc-files into the pkgconfig directory
719fix_library_files() { 713fix_library_files() {
720 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 714 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
721 if [[ -e ${libfile} ]]; then 715 if [[ -e ${libfile} ]]; then
722 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"
723 fi 717 fi
724 done 718 done
725 719
726 # 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:
727 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 721 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
728 if [[ -e ${libfile} ]]; then 722 if [[ -e ${libfile} ]]; then
729 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"
730 724
731 # Move .pc files into the pkgconfig directory 725 # Move .pc files into the pkgconfig directory
732 dodir ${QTPCDIR#${EPREFIX}} 726 dodir ${QTPCDIR#${EPREFIX}}
733 mv ${libfile} "${D}"/${QTPCDIR}/ \ 727 mv ${libfile} "${D}"/${QTPCDIR}/ \
734 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 728 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
735 fi 729 fi
736 done 730 done
737 731
738 # Don't install an empty directory 732 # Don't install an empty directory
739 rmdir "${D}"/${QTLIBDIR}/pkgconfig 733 rmdir "${D}"/${QTLIBDIR}/pkgconfig
… …
788 *-solaris*) 782 *-solaris*)
789 spec=solaris ;; 783 spec=solaris ;;
790 *-linux-*|*-linux) 784 *-linux-*|*-linux)
791 spec=linux ;; 785 spec=linux ;;
792 *) 786 *)
793 die "Unknown CHOST, no platform choosen." 787 die "Unknown CHOST, no platform chosen"
794 esac 788 esac
795 789
796 CXX=$(tc-getCXX) 790 CXX=$(tc-getCXX)
797 if [[ ${CXX} == *g++* ]]; then 791 if [[ ${CXX} == *g++* ]]; then
798 spec+=-g++ 792 spec+=-g++
799 elif [[ ${CXX} == *icpc* ]]; then 793 elif [[ ${CXX} == *icpc* ]]; then
800 spec+=-icc 794 spec+=-icc
801 else 795 else
802 die "Unknown compiler ${CXX}." 796 die "Unknown compiler '${CXX}'"
803 fi 797 fi
804 if [[ -n ${LIBDIR/lib} ]]; then 798 if [[ -n ${LIBDIR/lib} ]]; then
805 spec+=-${LIBDIR/lib} 799 spec+=-${LIBDIR/lib}
806 fi 800 fi
807 801
… …
819} 813}
820 814
821# @FUNCTION: qt_assistant_cleanup 815# @FUNCTION: qt_assistant_cleanup
822# @RETURN: nothing 816# @RETURN: nothing
823# @DESCRIPTION: 817# @DESCRIPTION:
824# Tries to clean up tools.pro for qt-assistant ebuilds 818# Tries to clean up tools.pro for qt-assistant ebuilds.
825# 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.
826qt_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
827 # different versions (and branches...) may need different handling, 828 # different versions (and branches...) may need different handling,
828 # add a case if you need special handling 829 # add a case if you need special handling
829 case "${MY_PV_EXTRA}" in 830 case "${MY_PV_EXTRA}" in
830 *kde-qt*) 831 *kde-qt*)
831 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 832 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
… …
844# @FUNCTION: qt_nolibx11 845# @FUNCTION: qt_nolibx11
845# @RETURN: nothing 846# @RETURN: nothing
846# @DESCRIPTION: 847# @DESCRIPTION:
847# 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
848qt_nolibx11() { 849qt_nolibx11() {
849 einfo "removing X11 check to allow X-less compilation" 850 einfo "Removing X11 check to allow X-less compilation"
850 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 ||
851 die "x11 check sed failed" 852 die "x11 check sed failed"
852} 853}
853 854
854EXPORT_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.97  
changed lines
  Added in v.1.100
  ViewVC Help
Powered by ViewVC 1.1.13