summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2013-04-07 21:14:46 +0000
committerDavide Pesavento <pesa@gentoo.org>2013-04-07 21:14:46 +0000
commitdcb6f34668caec1bdaeecc2c4673c1f8cec4c0db (patch)
treea3d429a6b02f23cfa9358116f2d27d3841932a95 /eclass/qt4-build.eclass
parentVersion bump. (diff)
downloadgentoo-2-dcb6f34668caec1bdaeecc2c4673c1f8cec4c0db.tar.gz
gentoo-2-dcb6f34668caec1bdaeecc2c4673c1f8cec4c0db.tar.bz2
gentoo-2-dcb6f34668caec1bdaeecc2c4673c1f8cec4c0db.zip
Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18.
Diffstat (limited to 'eclass/qt4-build.eclass')
-rw-r--r--eclass/qt4-build.eclass11
1 files changed, 1 insertions, 10 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index e14a66456201..6f06730ad85d 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.144 2013/03/03 00:22:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.145 2013/04/07 21:14:46 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -527,15 +527,6 @@ setqtenv() {
# @DESCRIPTION:
# Generates Makefiles for the given list of directories.
prepare_directories() {
- # 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\]:${QTLIBDIR}:g" \
- -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
- || die
-
for x in "$@"; do
pushd "${S}"/${x} >/dev/null || die
einfo "Running qmake in: ${x}"