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 | 043711f5e8fbe822c5023a4bfae6021aa9500f72 (patch) | |
| tree | 1bc769c0b96b53fbe101ea43da6e8be10e53ad1c /eclass/qt4-r2.eclass | |
| parent | Proxy-maint with Samuel Bauer. (diff) | |
| download | historical-043711f5e8fbe822c5023a4bfae6021aa9500f72.tar.gz historical-043711f5e8fbe822c5023a4bfae6021aa9500f72.tar.bz2 historical-043711f5e8fbe822c5023a4bfae6021aa9500f72.zip | |
Overhaul *FLAGS handling in eqmake4() to fix bug 361303. Thanks to Michael (kensington) for the patch.
Diffstat (limited to 'eclass/qt4-r2.eclass')
| -rw-r--r-- | eclass/qt4-r2.eclass | 17 |
1 files changed, 10 insertions, 7 deletions
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) \ |