diff options
| author |   Alex Alexander <wired@gentoo.org> | 2011-03-10 23:45:51 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2011-03-10 23:45:51 +0000 |
| commit | 1f3244e09bdd39357ae1234df74da5fed99b7cfa (patch) | |
| tree | f8b804600a5c640588cc416b90805c7fc3e40a47 /eclass | |
| parent | Revbump to use a new tarball that removes hyphens (fixes bug #358201). (diff) | |
| download | historical-1f3244e09bdd39357ae1234df74da5fed99b7cfa.tar.gz historical-1f3244e09bdd39357ae1234df74da5fed99b7cfa.tar.bz2 historical-1f3244e09bdd39357ae1234df74da5fed99b7cfa.zip | |
moved makefile generation from compile to configure phase.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 78655ddd26c8..5997e6d42641 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.89 2011/03/03 21:39:29 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.90 2011/03/10 23:45:51 wired Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -340,6 +340,8 @@ qt4-build_src_configure() { echo ./configure ${myconf} ./configure ${myconf} || die "./configure failed" myconf="" + + prepare_directories ${QT4_TARGET_DIRECTORIES} } # @FUNCTION: qt4-build_src_compile @@ -493,19 +495,32 @@ standard_configure_options() { echo "${myconf}" } -# @FUNCTION: build_directories +# @FUNCTION: prepare_directories # @USAGE: < directories > # @DESCRIPTION: -# Compiles the code in $QT4_TARGET_DIRECTORIES -build_directories() { +# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES +prepare_directories() { for x in "$@"; do pushd "${S}"/${x} >/dev/null + einfo "running qmake in: $x" # avoid running over the maximum argument number, bug #299810 { echo "${S}"/mkspecs/common/*.conf find "${S}" -name '*.pr[io]' } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" + popd >/dev/null + done +} + + +# @FUNCTION: build_directories +# @USAGE: < directories > +# @DESCRIPTION: +# Compiles the code in $QT4_TARGET_DIRECTORIES +build_directories() { + for x in "$@"; do + pushd "${S}"/${x} >/dev/null emake CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \ LINK="$(tc-getCXX)" || die "emake failed" |