diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-04-19 22:43:40 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-04-19 22:43:40 +0000 |
| commit | 2014f0a47c0ccbc9a7497e39db6eaf5b032b6ed9 (patch) | |
| tree | 38d83fea14fd414bbb953f46abff7f26aee17b80 /eclass | |
| parent | Proxy-maint with Samuel Bauer. (diff) | |
| download | gentoo-2-2014f0a47c0ccbc9a7497e39db6eaf5b032b6ed9.tar.gz gentoo-2-2014f0a47c0ccbc9a7497e39db6eaf5b032b6ed9.tar.bz2 gentoo-2-2014f0a47c0ccbc9a7497e39db6eaf5b032b6ed9.zip | |
Overhaul *FLAGS handling in eqmake4() to fix bug 361303. Thanks to Michael (kensington) for the patch.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-r2.eclass | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0ca2d4ebf110..bc3ab953a395 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.217 2012/04/19 19:49:25 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.218 2012/04/19 22:43:40 pesa Exp $ + + 19 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass: + Overhaul *FLAGS handling in eqmake4() to fix bug 361303. Thanks to Michael + (kensington) for the patch. 19 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> kde4-meta.eclass: No ewarns even if tar misses some files on unpack, as that is so common it's diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index f2c28322e1f5..e992f7b3d7c4 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.19 2012/02/13 01:31:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.20 2012/04/19 22:43:40 pesa Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -254,12 +254,15 @@ eqmake4() { QMAKE_CC="$(tc-getCC)" \ QMAKE_CXX="$(tc-getCXX)" \ QMAKE_LINK="$(tc-getCXX)" \ - QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ - QMAKE_CFLAGS_DEBUG="${CFLAGS}" \ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ - QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \ - QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ - QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CFLAGS_RELEASE= \ + QMAKE_CFLAGS_DEBUG= \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_CXXFLAGS_RELEASE= \ + QMAKE_CXXFLAGS_DEBUG= \ + QMAKE_LFLAGS="${LDFLAGS}" \ + QMAKE_LFLAGS_RELEASE= \ + QMAKE_LFLAGS_DEBUG= \ QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \ QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \ QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \ |