diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-04-07 21:14:46 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-04-07 21:14:46 +0000 |
| commit | f318872b8d4287cd3f7271d13ebae2f4c8ddd31a (patch) | |
| tree | 1296e3026472e0348c13695dba22752f5f4d7060 | |
| parent | Version bump. (diff) | |
| download | historical-f318872b8d4287cd3f7271d13ebae2f4c8ddd31a.tar.gz historical-f318872b8d4287cd3f7271d13ebae2f4c8ddd31a.tar.bz2 historical-f318872b8d4287cd3f7271d13ebae2f4c8ddd31a.zip | |
Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9bd03df11d09..09dea96b4cf8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.774 2013/04/07 17:46:23 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.775 2013/04/07 21:14:46 pesa Exp $ + + 07 Apr 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Remove wrong sed on QT_INSTALL_{LIBS,PLUGINS}. See bug 304971 comments 16-18. 07 Apr 2013; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass: Guard against multiple inheritance. Make KMCOMPILEONLY sed case-insensitive 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}" |