/[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.109 Revision 1.114
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.109 2011/12/26 00:11:07 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
136# @FUNCTION: qt4-build_src_unpack 136# @FUNCTION: qt4-build_src_unpack
137# @DESCRIPTION: 137# @DESCRIPTION:
138# Unpacks the sources. 138# Unpacks the sources.
139qt4-build_src_unpack() { 139qt4-build_src_unpack() {
140 setqtenv 140 setqtenv
141 local target targets= 141
142 local tarball="${MY_P}.tar.gz" target= targets=
142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 143 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
143 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 144 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
144 ${QT4_EXTRACT_DIRECTORIES}; do 145 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
146 do
145 targets+=" ${MY_P}/${target}" 147 targets+="${MY_P}/${target} "
146 done 148 done
147 149
150 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
148 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 151 tar -xzf "${DISTDIR}/${tarball}" ${targets}
149 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 152 eend $? || die "failed to unpack"
150} 153}
151 154
152# @ECLASS-VARIABLE: PATCHES 155# @ECLASS-VARIABLE: PATCHES
156# @DEFAULT_UNSET
153# @DESCRIPTION: 157# @DESCRIPTION:
154# In case you have patches to apply, specify them in PATCHES variable. Make sure 158# PATCHES array variable containing all various patches to be applied.
155# to specify the full path. This variable is necessary for src_prepare phase. 159# This variable is expected to be defined in global scope of ebuild.
156# Example: 160# Make sure to specify the full path. This variable is utilised in
157# PATCHES="${FILESDIR}"/mypatch.patch 161# src_unpack/src_prepare phase, based on EAPI.
158# ${FILESDIR}"/mypatch2.patch"
159# 162#
163# @CODE
164# PATCHES=( "${FILESDIR}/mypatch.patch"
165# "${FILESDIR}/patches_folder/" )
166# @CODE
160 167
161# @FUNCTION: qt4-build_src_prepare 168# @FUNCTION: qt4-build_src_prepare
162# @DESCRIPTION: 169# @DESCRIPTION:
163# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 170# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
164# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. 171# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
229 CC='$(tc-getCC)'\n\ 236 CC='$(tc-getCC)'\n\
230 CXX='$(tc-getCXX)'\n\ 237 CXX='$(tc-getCXX)'\n\
231 CFLAGS='${CFLAGS}'\n\ 238 CFLAGS='${CFLAGS}'\n\
232 CXXFLAGS='${CXXFLAGS}'\n\ 239 CXXFLAGS='${CXXFLAGS}'\n\
233 LDFLAGS='${LDFLAGS}'\n" \ 240 LDFLAGS='${LDFLAGS}'\n" \
241 -i configure \
234 -i configure || die "sed SYSTEM_VARIABLES failed" 242 || die "sed SYSTEM_VARIABLES failed"
235 243
236 # Bug 321335 244 # Respect CC, CXX, LINK and *FLAGS in config.tests
237 find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \ 245 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
238 sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \ 246 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
239 -i || die "sed test compilers failed" 247 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
248 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
249 || die "sed config.tests failed"
250
251 # Strip predefined CFLAGS from mkspecs (bug 312689)
252 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
240 253
241 # Bug 172219 254 # Bug 172219
242 sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 255 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
243 256
244 if [[ ${CHOST} == *-darwin* ]]; then 257 if [[ ${CHOST} == *-darwin* ]]; then
245 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 258 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
246 # crippled (by design) :/ 259 # crippled (by design) :/
260 sed \
247 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 261 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
248 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 262 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
249 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ 263 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
250 -e "s:-arch\s\w*::g" \ 264 -e "s:-arch\s\w*::g" \
251 -i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed" 265 -i mkspecs/common/mac-g++.conf \
266 || die "sed mkspecs/common/mac-g++.conf failed"
252 267
253 # Fix configure's -arch settings that appear in qmake/Makefile and also 268 # Fix configure's -arch settings that appear in qmake/Makefile and also
254 # fix arch handling (automagically duplicates our -arch arg and breaks 269 # fix arch handling (automagically duplicates our -arch arg and breaks
255 # pch). Additionally disable Xarch support. 270 # pch). Additionally disable Xarch support.
256 sed \ 271 sed \
261 -e "s:-arch \$i::" \ 276 -e "s:-arch \$i::" \
262 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 277 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
263 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 278 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
264 -e "s:-Xarch_x86_64::g" \ 279 -e "s:-Xarch_x86_64::g" \
265 -e "s:-Xarch_ppc64::g" \ 280 -e "s:-Xarch_ppc64::g" \
266 -i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed" 281 -i configure mkspecs/common/mac-g++.conf \
282 || die "sed -arch/-Xarch failed"
267 283
268 # On Snow Leopard don't fall back to 10.5 deployment target. 284 # On Snow Leopard don't fall back to 10.5 deployment target.
269 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 285 if [[ ${CHOST} == *-apple-darwin10 ]] ; then
270 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 286 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
271 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 287 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
272 -i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed" 288 -i configure mkspecs/common/mac-g++.conf \
289 || die "sed deployment target failed"
273 fi 290 fi
274 fi 291 fi
275 292
276 # this one is needed for all systems with a separate -liconv, apart from 293 # this one is needed for all systems with a separate -liconv, apart from
277 # Darwin, for which the sources already cater for -liconv 294 # Darwin, for which the sources already cater for -liconv
278 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then 295 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then
279 sed \ 296 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
280 -e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
281 -i config.tests/unix/iconv/iconv.pro \ 297 -i config.tests/unix/iconv/iconv.pro \
282 || die "sed on iconv.pro failed" 298 || die "sed iconv.pro failed"
283 fi 299 fi
284 300
285 # we need some patches for Solaris 301 # we need some patches for Solaris
286 sed -i \
287 -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ 302 sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
288 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 303 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
289 # use GCC over SunStudio 304 # use GCC over SunStudio
290 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 305 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
291 # don't flirt with non-Prefix stuff, we're quite possessive 306 # do not flirt with non-Prefix stuff, we're quite possessive
292 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 307 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
293 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 308 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
294 # strip predefined CFLAGS from qmake ( bug #312689 )
295 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
296 309
297 base_src_prepare 310 base_src_prepare
298} 311}
299 312
300# @FUNCTION: qt4-build_src_configure 313# @FUNCTION: qt4-build_src_configure
332 myconf+=" -cocoa -framework" 345 myconf+=" -cocoa -framework"
333 346
334 # We are crazy and build cocoa + qt3support :-) 347 # We are crazy and build cocoa + qt3support :-)
335 if use qt3support; then 348 if use qt3support; then
336 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ 349 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
337 -i configure 350 -i configure || die
338 fi 351 fi
339 352
340 # We need the source's headers, not the installed ones. 353 # We need the source's headers, not the installed ones.
341 myconf+=" -I${S}/include" 354 myconf+=" -I${S}/include"
342 355
382 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 395 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
383 # Some packages tend to include <Qt/...> 396 # Some packages tend to include <Qt/...>
384 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 397 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
385 398
386 # Fake normal headers when frameworks are installed... eases life later on 399 # Fake normal headers when frameworks are installed... eases life later on
387 local dest f 400 local dest f h
388 for frw in "${D}${QTLIBDIR}"/*.framework; do 401 for frw in "${D}${QTLIBDIR}"/*.framework; do
389 [[ -e "${frw}"/Headers ]] || continue 402 [[ -e "${frw}"/Headers ]] || continue
390 f=$(basename ${frw}) 403 f=$(basename ${frw})
391 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 404 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
392 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 405 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
411 install_qconfigs 424 install_qconfigs
412 fix_library_files 425 fix_library_files
413 fix_includes 426 fix_includes
414 427
415 # remove .la files since we are building only shared Qt libraries 428 # remove .la files since we are building only shared Qt libraries
416 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 429 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
417} 430}
418 431
419# @FUNCTION: setqtenv 432# @FUNCTION: setqtenv
433# @INTERNAL
420setqtenv() { 434setqtenv() {
421 # Set up installation directories 435 # Set up installation directories
422 QTPREFIXDIR=${EPREFIX}/usr 436 QTPREFIXDIR=${EPREFIX}/usr
423 QTBINDIR=${EPREFIX}/usr/bin 437 QTBINDIR=${EPREFIX}/usr/bin
424 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 438 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
439 453
440 unset QMAKESPEC 454 unset QMAKESPEC
441} 455}
442 456
443# @FUNCTION: standard_configure_options 457# @FUNCTION: standard_configure_options
458# @INTERNAL
444# @DESCRIPTION: 459# @DESCRIPTION:
445# Sets up some standard configure options, like libdir (if necessary), whether 460# Sets up some standard configure options, like libdir (if necessary), whether
446# debug info is wanted or not. 461# debug info is wanted or not.
447standard_configure_options() { 462standard_configure_options() {
448 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 463 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
499 echo "${myconf}" 514 echo "${myconf}"
500} 515}
501 516
502# @FUNCTION: prepare_directories 517# @FUNCTION: prepare_directories
503# @USAGE: < directories > 518# @USAGE: < directories >
519# @INTERNAL
504# @DESCRIPTION: 520# @DESCRIPTION:
505# Generates Makefiles for the given list of directories. 521# Generates Makefiles for the given list of directories.
506prepare_directories() { 522prepare_directories() {
507 for x in "$@"; do 523 for x in "$@"; do
508 pushd "${S}"/${x} >/dev/null || die 524 pushd "${S}"/${x} >/dev/null || die
521} 537}
522 538
523 539
524# @FUNCTION: build_directories 540# @FUNCTION: build_directories
525# @USAGE: < directories > 541# @USAGE: < directories >
542# @INTERNAL
526# @DESCRIPTION: 543# @DESCRIPTION:
527# Compiles the code in the given list of directories. 544# Compiles the code in the given list of directories.
528build_directories() { 545build_directories() {
529 for x in "$@"; do 546 for x in "$@"; do
530 pushd "${S}"/${x} >/dev/null || die 547 pushd "${S}"/${x} >/dev/null || die
535 done 552 done
536} 553}
537 554
538# @FUNCTION: install_directories 555# @FUNCTION: install_directories
539# @USAGE: < directories > 556# @USAGE: < directories >
557# @INTERNAL
540# @DESCRIPTION: 558# @DESCRIPTION:
541# Runs emake install in the given directories, which are separated by spaces. 559# Runs emake install in the given directories, which are separated by spaces.
542install_directories() { 560install_directories() {
543 for x in "$@"; do 561 for x in "$@"; do
544 pushd "${S}"/${x} >/dev/null || die 562 pushd "${S}"/${x} >/dev/null || die
561# @DESCRIPTION: 579# @DESCRIPTION:
562# List variables that should be defined at the top of QtCore/qconfig.h 580# List variables that should be defined at the top of QtCore/qconfig.h
563: ${QCONFIG_DEFINE:=} 581: ${QCONFIG_DEFINE:=}
564 582
565# @FUNCTION: install_qconfigs 583# @FUNCTION: install_qconfigs
584# @INTERNAL
566# @DESCRIPTION: 585# @DESCRIPTION:
567# Install gentoo-specific mkspecs configurations. 586# Install gentoo-specific mkspecs configurations.
568install_qconfigs() { 587install_qconfigs() {
569 local x 588 local x
570 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 589 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
583 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 602 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
584 fi 603 fi
585} 604}
586 605
587# @FUNCTION: generate_qconfigs 606# @FUNCTION: generate_qconfigs
607# @INTERNAL
588# @DESCRIPTION: 608# @DESCRIPTION:
589# Generates gentoo-specific qconfig.{h,pri}. 609# Generates gentoo-specific qconfig.{h,pri}.
590generate_qconfigs() { 610generate_qconfigs() {
591 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 611 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
592 local x qconfig_add qconfig_remove qconfig_new 612 local x qconfig_add qconfig_remove qconfig_new
657qt4-build_pkg_postinst() { 677qt4-build_pkg_postinst() {
658 generate_qconfigs 678 generate_qconfigs
659} 679}
660 680
661# @FUNCTION: skip_qmake_build 681# @FUNCTION: skip_qmake_build
682# @INTERNAL
662# @DESCRIPTION: 683# @DESCRIPTION:
663# Patches configure to skip qmake compilation, as it's already installed by qt-core. 684# Patches configure to skip qmake compilation, as it's already installed by qt-core.
664skip_qmake_build() { 685skip_qmake_build() {
665 sed -i -e "s:if true:if false:g" "${S}"/configure || die 686 sed -i -e "s:if true:if false:g" "${S}"/configure || die
666} 687}
667 688
668# @FUNCTION: skip_project_generation 689# @FUNCTION: skip_project_generation
690# @INTERNAL
669# @DESCRIPTION: 691# @DESCRIPTION:
670# 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.
671skip_project_generation() { 693skip_project_generation() {
672 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die 694 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
673} 695}
674 696
675# @FUNCTION: symlink_binaries_to_buildtree 697# @FUNCTION: symlink_binaries_to_buildtree
698# @INTERNAL
676# @DESCRIPTION: 699# @DESCRIPTION:
677# Symlinks generated binaries to buildtree, so they can be used during compilation time. 700# Symlinks generated binaries to buildtree, so they can be used during compilation time.
678symlink_binaries_to_buildtree() { 701symlink_binaries_to_buildtree() {
679 for bin in qmake moc uic rcc; do 702 for bin in qmake moc uic rcc; do
680 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed" 703 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
681 done 704 done
682} 705}
683 706
684# @FUNCTION: fix_library_files 707# @FUNCTION: fix_library_files
708# @INTERNAL
685# @DESCRIPTION: 709# @DESCRIPTION:
686# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and 710# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
687# moves the *.pc files into the pkgconfig directory. 711# moves the *.pc files into the pkgconfig directory.
688fix_library_files() { 712fix_library_files() {
689 local libfile 713 local libfile
709} 733}
710 734
711# @FUNCTION: qt_use 735# @FUNCTION: qt_use
712# @USAGE: < flag > [ feature ] [ enableval ] 736# @USAGE: < flag > [ feature ] [ enableval ]
713# @DESCRIPTION: 737# @DESCRIPTION:
714# This will echo "${enableval}-${feature}" if <flag> is enabled, or 738# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
715# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 739# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
716# will be used for that. If [enableval] is not specified, it omits the 740# will be used for that. If [enableval] is not specified, it omits the
717# assignment part. 741# "-${enableval}" part.
718qt_use() { 742qt_use() {
719 local flag=$1 743 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
720 local feature=$1
721 local enableval=
722
723 [[ -n $2 ]] && feature=$2
724 [[ -n $3 ]] && enableval=-$3
725
726 if use ${flag}; then
727 echo "${enableval}-${feature}"
728 else
729 echo "-no-${feature}"
730 fi
731} 744}
732 745
733# @FUNCTION: qt_mkspecs_dir 746# @FUNCTION: qt_mkspecs_dir
734# @RETURN: the specs-directory w/o path 747# @RETURN: the specs-directory w/o path
735# @DESCRIPTION: 748# @DESCRIPTION:
784 797
785 echo "${spec}" 798 echo "${spec}"
786} 799}
787 800
788# @FUNCTION: qt_assistant_cleanup 801# @FUNCTION: qt_assistant_cleanup
802# @INTERNAL
789# @DESCRIPTION: 803# @DESCRIPTION:
790# Tries to clean up tools.pro for qt-assistant ebuilds. 804# Tries to clean up tools.pro for qt-assistant ebuilds.
791# Meant to be called in src_prepare(). 805# Meant to be called in src_prepare().
792# Since Qt 4.7.4 this function is a no-op. 806# Since Qt 4.7.4 this function is a no-op.
793qt_assistant_cleanup() { 807qt_assistant_cleanup() {
813 ;; 827 ;;
814 esac 828 esac
815} 829}
816 830
817# @FUNCTION: qt_nolibx11 831# @FUNCTION: qt_nolibx11
832# @INTERNAL
818# @DESCRIPTION: 833# @DESCRIPTION:
819# Ignore X11 tests for packages that don't need X libraries installed. 834# Ignore X11 tests for packages that don't need X libraries installed.
820qt_nolibx11() { 835qt_nolibx11() {
821 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 836 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
822 die "x11 check sed failed" 837 die "x11 check sed failed"

Legend:
Removed from v.1.109  
changed lines
  Added in v.1.114

  ViewVC Help
Powered by ViewVC 1.1.20