/[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.84 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.84 2010/10/13 19:33:17 armin76 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 ]] && IUSE="+exceptions" 17 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
18 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
19 IUSE="+exceptions"
21else 20else
22 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"
23fi 26fi
24 27
25HOMEPAGE="http://qt.nokia.com/" 28HOMEPAGE="http://qt.nokia.com/"
26SRC_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"
27 30
79 else 82 else
80 ewarn "Downgrading Qt is completely unsupported and will break your system!" 83 ewarn "Downgrading Qt is completely unsupported and will break your system!"
81 fi 84 fi
82 fi 85 fi
83 86
84 if [[ "${PN}" == "qt-webkit" ]]; then 87 if [[ ${PN} == "qt-webkit" ]]; then
85 eshopts_push -s extglob 88 eshopts_push -s extglob
86 if is-flagq '-g?(gdb)?([1-9])'; then 89 if is-flagq '-g?(gdb)?([1-9])'; then
87 echo 90 echo
88 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)."
89 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."
133# @FUNCTION: qt4-build_src_unpack 136# @FUNCTION: qt4-build_src_unpack
134# @DESCRIPTION: 137# @DESCRIPTION:
135# Unpacks the sources 138# Unpacks the sources
136qt4-build_src_unpack() { 139qt4-build_src_unpack() {
137 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
138 local target targets= 147 local target targets=
139 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 148 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
140 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 \
141 ${QT4_EXTRACT_DIRECTORIES}; do 150 ${QT4_EXTRACT_DIRECTORIES}; do
142 targets+=" ${MY_P}/${target}" 151 targets+=" ${unpack_p}/${target}"
143 done 152 done
144 153
145 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 154 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
146 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
147} 162}
148 163
149# @ECLASS-VARIABLE: PATCHES 164# @ECLASS-VARIABLE: PATCHES
150# @DESCRIPTION: 165# @DESCRIPTION:
151# 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
160# 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
161# 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.
162qt4-build_src_prepare() { 177qt4-build_src_prepare() {
163 setqtenv 178 setqtenv
164 cd "${S}" 179 cd "${S}"
165 180
166 # fix qt 4.7 regression that skips -fvisibility=hidden 181 # fix qt 4.7 regression that skips -fvisibility=hidden
167 if version_is_at_least "4.7.0_beta1"; then 182 if version_is_at_least "4.7.0_beta1"; then
168 sed -e "s/^gcc|g++)/*gcc|*g++)/" \ 183 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
169 -i config.tests/unix/fvisibility.test || 184 -i config.tests/unix/fvisibility.test ||
170 die "visibility fixing sed failed" 185 die "visibility fixing sed failed"
171 fi 186 fi
187
188 if version_is_at_least "4.7"; then
172 # fix libx11 dependency on non X packages 189 # fix libX11 dependency on non X packages
173 if version_is_at_least "4.7.0_beta2"; then
174 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"
175 hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 191 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
176 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 192
193 qt_assistant_cleanup
177 fi 194 fi
178 195
179 if use aqua; then 196 if use aqua; then
180 # provide a proper macx-g++-64 197 # provide a proper macx-g++-64
181 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 198 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
198 215
199 # Bug 178652 216 # Bug 178652
200 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 217 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
201 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 218 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
202 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
203 fi 229 fi
204 230
205 # Unsupported old gcc versions - hardened needs this :( 231 # Unsupported old gcc versions - hardened needs this :(
206 if [[ $(gcc-major-version) -lt 4 ]] ; then 232 if [[ $(gcc-major-version) -lt 4 ]] ; then
207 ewarn "Appending -fno-stack-protector to CXXFLAGS" 233 ewarn "Appending -fno-stack-protector to CXXFLAGS"
216 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 242 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
217 append-flags -mminimal-toc 243 append-flags -mminimal-toc
218 fi 244 fi
219 245
220 # Bug 282984 && Bug 295530 246 # Bug 282984 && Bug 295530
221 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:" \
222 -i configure || die "sed qmake compilers failed" 248 -i configure || die "sed qmake compilers failed"
249
223 # bug 321335 250 # Bug 321335
224 if version_is_at_least 4.6; then 251 if version_is_at_least 4.6; then
225 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 '{}' \; | \
226 xargs -0 \ 253 xargs -0 \
227 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" \
228 -i || die "sed test compilers failed" 255 -i || die "sed test compilers failed"
229 fi 256 fi
230 257
231 # Bug 172219 258 # Bug 172219
232 sed -e "s:X11R6/::" \ 259 sed -e "s:X11R6/::" \
298 # 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
299 # Darwin, for which the sources already cater for -liconv 326 # Darwin, for which the sources already cater for -liconv
300 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 327 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
301 myconf+=" -liconv" 328 myconf+=" -liconv"
302 329
303 if has glib ${IUSE//+} && use glib; then 330 if use_if_iuse glib; then
304 # use -I, -L and -l from configure 331 # use -I, -L and -l from configure
305 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)"
306 # avoid the -pthread argument 333 # avoid the -pthread argument
307 myconf+=" ${glibflags//-pthread}" 334 myconf+=" ${glibflags//-pthread}"
308 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"
309 fi 345 fi
310 346
311 if use aqua ; then 347 if use aqua ; then
312 # On (snow) leopard use the new (frameworked) cocoa code. 348 # On (snow) leopard use the new (frameworked) cocoa code.
313 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 349 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
329 # freetype2 include dir is non-standard, thus include it on configure 365 # freetype2 include dir is non-standard, thus include it on configure
330 # use -I from configure 366 # use -I from configure
331 myconf+=" $(pkg-config --cflags freetype2)" 367 myconf+=" $(pkg-config --cflags freetype2)"
332 fi 368 fi
333 369
370 # Disable SSE4.x, since auto-detection is currently broken
371 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
372 [[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
373
334 echo ./configure ${myconf} 374 echo ./configure ${myconf}
335 ./configure ${myconf} || die "./configure failed" 375 ./configure ${myconf} || die "./configure failed"
336 myconf="" 376 myconf=""
377
378 prepare_directories ${QT4_TARGET_DIRECTORIES}
337} 379}
338 380
339# @FUNCTION: qt4-build_src_compile 381# @FUNCTION: qt4-build_src_compile
382# @DESCRIPTION:
340# @DESCRIPTION: Actual compile phase 383# Actual compile phase
341qt4-build_src_compile() { 384qt4-build_src_compile() {
342 setqtenv 385 setqtenv
343 386
344 build_directories ${QT4_TARGET_DIRECTORIES} 387 build_directories ${QT4_TARGET_DIRECTORIES}
345} 388}
383# @DESCRIPTION: 426# @DESCRIPTION:
384# Perform the actual installation including some library fixes. 427# Perform the actual installation including some library fixes.
385qt4-build_src_install() { 428qt4-build_src_install() {
386 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 429 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
387 setqtenv 430 setqtenv
431
388 install_directories ${QT4_TARGET_DIRECTORIES} 432 install_directories ${QT4_TARGET_DIRECTORIES}
389 install_qconfigs 433 install_qconfigs
390 fix_library_files 434 fix_library_files
391 fix_includes 435 fix_includes
436
392 # remove .la files since we are building only shared Qt libraries 437 # remove .la files since we are building only shared Qt libraries
393 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 438 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
394} 439}
395 440
396# @FUNCTION: setqtenv 441# @FUNCTION: setqtenv
397setqtenv() { 442setqtenv() {
398 # Set up installation directories 443 # Set up installation directories
485 -nomake examples -nomake demos" 530 -nomake examples -nomake demos"
486 531
487 echo "${myconf}" 532 echo "${myconf}"
488} 533}
489 534
490# @FUNCTION: build_directories 535# @FUNCTION: prepare_directories
491# @USAGE: < directories > 536# @USAGE: < directories >
492# @DESCRIPTION: 537# @DESCRIPTION:
493# Compiles the code in $QT4_TARGET_DIRECTORIES 538# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
494build_directories() { 539prepare_directories() {
495 for x in "$@"; do 540 for x in "$@"; do
496 pushd "${S}"/${x} >/dev/null 541 pushd "${S}"/${x} >/dev/null
542 einfo "Running qmake in: ${x}"
497 # avoid running over the maximum argument number, bug #299810 543 # avoid running over the maximum argument number, bug #299810
498 { 544 {
499 echo "${S}"/mkspecs/common/*.conf 545 echo "${S}"/mkspecs/common/*.conf
500 find "${S}" -name '*.pr[io]' 546 find "${S}" -name '*.pr[io]'
501 } | 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
502 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 548 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
549 popd >/dev/null
550 done
551}
552
553
554# @FUNCTION: build_directories
555# @USAGE: < directories >
556# @DESCRIPTION:
557# Compiles the code in $QT4_TARGET_DIRECTORIES
558build_directories() {
559 for x in "$@"; do
560 pushd "${S}"/${x} >/dev/null
503 emake CC="$(tc-getCC)" \ 561 emake CC="$(tc-getCC)" \
504 CXX="$(tc-getCXX)" \ 562 CXX="$(tc-getCXX)" \
505 LINK="$(tc-getCXX)" || die "emake failed" 563 LINK="$(tc-getCXX)" || die "emake failed"
506 popd >/dev/null 564 popd >/dev/null
507 done 565 done
533# @DESCRIPTION: 591# @DESCRIPTION:
534# 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
535: ${QCONFIG_DEFINE:=} 593: ${QCONFIG_DEFINE:=}
536 594
537# @FUNCTION: install_qconfigs 595# @FUNCTION: install_qconfigs
596# @DESCRIPTION:
538# @DESCRIPTION: Install gentoo-specific mkspecs configurations 597# Install gentoo-specific mkspecs configurations
539install_qconfigs() { 598install_qconfigs() {
540 local x 599 local x
541 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 600 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
542 for x in QCONFIG_ADD QCONFIG_REMOVE; do 601 for x in QCONFIG_ADD QCONFIG_REMOVE; do
543 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 602 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
554 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"
555 fi 614 fi
556} 615}
557 616
558# @FUNCTION: generate_qconfigs 617# @FUNCTION: generate_qconfigs
618# @DESCRIPTION:
559# @DESCRIPTION: Generates gentoo-specific configurations 619# Generates gentoo-specific configurations
560generate_qconfigs() { 620generate_qconfigs() {
561 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
562 local x qconfig_add qconfig_remove qconfig_new 622 local x qconfig_add qconfig_remove qconfig_new
563 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 623 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
564 [[ -f ${x} ]] || continue 624 [[ -f ${x} ]] || continue
578 638
579 # generate list of QT_CONFIG entries from the existing list 639 # generate list of QT_CONFIG entries from the existing list
580 # including qconfig_add and excluding qconfig_remove 640 # including qconfig_add and excluding qconfig_remove
581 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 641 for x in $(sed -n 's/^QT_CONFIG +=//p' \
582 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 642 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
583 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" 643 has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
584 done 644 done
585 645
586 # replace the existing QT_CONFIG list with qconfig_new 646 # replace the existing QT_CONFIG list with qconfig_new
587 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 647 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
588 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 648 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
612 fi 672 fi
613 fi 673 fi
614} 674}
615 675
616# @FUNCTION: qt4-build_pkg_postrm 676# @FUNCTION: qt4-build_pkg_postrm
677# @DESCRIPTION:
617# @DESCRIPTION: Generate configurations when the package is completely removed 678# Generate configurations when the package is completely removed
618qt4-build_pkg_postrm() { 679qt4-build_pkg_postrm() {
619 generate_qconfigs 680 generate_qconfigs
620} 681}
621 682
622# @FUNCTION: qt4-build_pkg_postinst 683# @FUNCTION: qt4-build_pkg_postinst
684# @DESCRIPTION:
623# @DESCRIPTION: Generate configuration, plus throws a message about possible 685# Generate configuration, plus throws a message about possible
624# breakages and proposed solutions. 686# breakages and proposed solutions.
625qt4-build_pkg_postinst() { 687qt4-build_pkg_postinst() {
626 generate_qconfigs 688 generate_qconfigs
627} 689}
628 690
629# @FUNCTION: skip_qmake_build_patch 691# @FUNCTION: skip_qmake_build_patch
630# @DESCRIPTION: 692# @DESCRIPTION:
631# 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
632skip_qmake_build_patch() { 694skip_qmake_build_patch() {
633 # 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
634 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"
635} 697}
636 698
637# @FUNCTION: skip_project_generation_patch 699# @FUNCTION: skip_project_generation_patch
638# @DESCRIPTION: 700# @DESCRIPTION:
639# 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
640skip_project_generation_patch() { 702skip_project_generation_patch() {
641 # 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
642 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 704 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
643 -i "${S}"/configure || die "Sed failed" 705 -i "${S}"/configure || die "sed failed"
644} 706}
645 707
646# @FUNCTION: symlink_binaries_to_buildtree 708# @FUNCTION: symlink_binaries_to_buildtree
647# @DESCRIPTION: 709# @DESCRIPTION:
648# 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
649# time 711# time
650symlink_binaries_to_buildtree() { 712symlink_binaries_to_buildtree() {
651 for bin in qmake moc uic rcc; do 713 for bin in qmake moc uic rcc; do
652 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"
653 done 715 done
654} 716}
655 717
656# @FUNCTION: fix_library_files 718# @FUNCTION: fix_library_files
657# @DESCRIPTION: 719# @DESCRIPTION:
658# 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
659# moves the *.pc-files into the pkgconfig directory 721# moves the *.pc-files into the pkgconfig directory
660fix_library_files() { 722fix_library_files() {
661 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 723 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
662 if [[ -e ${libfile} ]]; then 724 if [[ -e ${libfile} ]]; then
663 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"
664 fi 726 fi
665 done 727 done
666 728
667 # 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:
668 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 730 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
669 if [[ -e ${libfile} ]]; then 731 if [[ -e ${libfile} ]]; then
670 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"
671 733
672 # Move .pc files into the pkgconfig directory 734 # Move .pc files into the pkgconfig directory
673 dodir ${QTPCDIR#${EPREFIX}} 735 dodir ${QTPCDIR#${EPREFIX}}
674 mv ${libfile} "${D}"/${QTPCDIR}/ \ 736 mv ${libfile} "${D}"/${QTPCDIR}/ \
675 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 737 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
676 fi 738 fi
677 done 739 done
678 740
679 # Don't install an empty directory 741 # Don't install an empty directory
680 rmdir "${D}"/${QTLIBDIR}/pkgconfig 742 rmdir "${D}"/${QTLIBDIR}/pkgconfig
729 *-solaris*) 791 *-solaris*)
730 spec=solaris ;; 792 spec=solaris ;;
731 *-linux-*|*-linux) 793 *-linux-*|*-linux)
732 spec=linux ;; 794 spec=linux ;;
733 *) 795 *)
734 die "Unknown CHOST, no platform choosen." 796 die "Unknown CHOST, no platform chosen."
735 esac 797 esac
736 798
737 CXX=$(tc-getCXX) 799 CXX=$(tc-getCXX)
738 if [[ ${CXX} == *g++* ]]; then 800 if [[ ${CXX} == *g++* ]]; then
739 spec+=-g++ 801 spec+=-g++
740 elif [[ ${CXX} == *icpc* ]]; then 802 elif [[ ${CXX} == *icpc* ]]; then
741 spec+=-icc 803 spec+=-icc
742 else 804 else
743 die "Unknown compiler ${CXX}." 805 die "Unknown compiler '${CXX}'."
744 fi 806 fi
745 if [[ -n ${LIBDIR/lib} ]]; then 807 if [[ -n ${LIBDIR/lib} ]]; then
746 spec+=-${LIBDIR/lib} 808 spec+=-${LIBDIR/lib}
747 fi 809 fi
748 810
760} 822}
761 823
762# @FUNCTION: qt_assistant_cleanup 824# @FUNCTION: qt_assistant_cleanup
763# @RETURN: nothing 825# @RETURN: nothing
764# @DESCRIPTION: 826# @DESCRIPTION:
765# Tries to clean up tools.pro for qt-assistant ebuilds 827# Tries to clean up tools.pro for qt-assistant ebuilds.
766# 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.
767qt_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
768 # different versions (and branches...) may need different handling, 837 # different versions (and branches...) may need different handling,
769 # add a case if you need special handling 838 # add a case if you need special handling
770 case "${MY_PV_EXTRA}" in 839 case "${MY_PV_EXTRA}" in
771 *kde-qt*) 840 *kde-qt*)
772 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 841 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
785# @FUNCTION: qt_nolibx11 854# @FUNCTION: qt_nolibx11
786# @RETURN: nothing 855# @RETURN: nothing
787# @DESCRIPTION: 856# @DESCRIPTION:
788# 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
789qt_nolibx11() { 858qt_nolibx11() {
790 einfo "removing X11 check to allow X-less compilation" 859 einfo "Removing X11 check to allow X-less compilation"
791 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 ||
792 die "x11 check sed failed" 861 die "x11 check sed failed"
793} 862}
794 863
795EXPORT_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.84  
changed lines
  Added in v.1.99

  ViewVC Help
Powered by ViewVC 1.1.20