diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-01-13 19:35:01 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-01-13 19:35:01 +0000 |
| commit | af1708c221f954bae3319b20704337a617d00509 (patch) | |
| tree | 81e0439226b191cd2ff0ef468dd17730d7f94e5e /eclass | |
| parent | stable ppc64, bug 300707 (diff) | |
| download | gentoo-2-af1708c221f954bae3319b20704337a617d00509.tar.gz gentoo-2-af1708c221f954bae3319b20704337a617d00509.tar.bz2 gentoo-2-af1708c221f954bae3319b20704337a617d00509.zip | |
Add last couple of changes from prefix overlay
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ea47d7483027..731c79638443 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.59 2009/12/25 15:27:22 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.60 2010/01/13 19:35:01 abcd Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -315,7 +315,7 @@ qt4-build_src_compile() { # For MacOSX we need to add some symlinks when frameworks are # being used, to avoid complications with some more or less stupid packages. fix_includes() { - if use aqua && [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then # Some packages tend to include <Qt/...> dodir "${QTHEADERDIR#${EPREFIX}}"/Qt @@ -458,7 +458,11 @@ standard_configure_options() { build_directories() { for x in "$@"; do pushd "${S}"/${x} >/dev/null - sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/*.conf || die + # 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" emake CC="@echo compiling \$< && $(tc-getCC)" \ CXX="@echo compiling \$< && $(tc-getCXX)" \ |