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

  ViewVC Help
Powered by ViewVC 1.1.20