diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-09-06 08:30:00 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-09-06 08:30:00 +0000 |
| commit | d129d55584d8adf40dcf62b77662759d324f8e1f (patch) | |
| tree | 16ae9f5d76d534e84e02966a2e17d39a69bee2a0 /eclass | |
| parent | Unmask OpenCL-capable llvm & clang, the issue has been resolved. (diff) | |
| download | gentoo-2-d129d55584d8adf40dcf62b77662759d324f8e1f.tar.gz gentoo-2-d129d55584d8adf40dcf62b77662759d324f8e1f.tar.bz2 gentoo-2-d129d55584d8adf40dcf62b77662759d324f8e1f.zip | |
Improve respect for *FLAGS. Fixes part of bug #427782.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9a4e5ca71094..c800c179ca28 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.387 2012/09/04 14:08:24 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.388 2012/09/06 08:30:00 kensington Exp $ + + 06 Sep 2012; Michael Palimaka <kensington@gentoo.org> qt4-build.eclass: + Improve respect for *FLAGS. Fixes part of bug #427782. 04 Sep 2012; Johannes Huber <johu@gentoo.org> kde4-meta.eclass: Dont try to extract cmake/modules for kdegames > 4.9.0. Its removed from diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 3b75f4fc433e..a39865816216 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.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-build.eclass,v 1.134 2012/07/10 21:43:19 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.135 2012/09/06 08:30:00 kensington Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -266,7 +266,13 @@ qt4-build_src_prepare() { CXX='$(tc-getCXX)'\n\ CFLAGS='${CFLAGS}'\n\ CXXFLAGS='${CXXFLAGS}'\n\ - LDFLAGS='${LDFLAGS}'\n" \ + LDFLAGS='${LDFLAGS}'\n\ + QMakeVar set QMAKE_CFLAGS_RELEASE\n\ + QMakeVar set QMAKE_CFLAGS_DEBUG\n\ + QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\ + QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\ + QMakeVar set QMAKE_LFLAGS_RELEASE\n\ + QMakeVar set QMAKE_LFLAGS_DEBUG\n"\ -i configure \ || die "sed SYSTEM_VARIABLES failed" |