diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-12-18 16:39:08 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-12-18 16:39:08 +0000 |
| commit | 948496adfbe3dae4d21c179085aaa8de658fd6e6 (patch) | |
| tree | c0af074baa29e9276ca38f3c73f831c2111ff000 /eclass | |
| parent | Version bump. Cleanup old. (diff) | |
| download | gentoo-2-948496adfbe3dae4d21c179085aaa8de658fd6e6.tar.gz gentoo-2-948496adfbe3dae4d21c179085aaa8de658fd6e6.tar.bz2 gentoo-2-948496adfbe3dae4d21c179085aaa8de658fd6e6.zip | |
Declare local CPPFLAGS to avoid multiple appends in cmake-multilib.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 121bd8293a13..5079388361ee 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1467 2014/12/18 14:35:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1468 2014/12/18 16:39:08 kensington Exp $ + + 18 Dec 2014; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass: + Declare local CPPFLAGS to avoid multiple appends in cmake-multilib. 18 Dec 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: Fix breakage caused by recent multilib-build.eclass changes (bug 532510). diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 07f9b635149f..04c1c4808081 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.112 2014/10/27 09:49:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.113 2014/12/18 16:39:08 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -450,6 +450,7 @@ enable_cmake-utils_src_configure() { if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then # Handle release builds if ! has debug ${IUSE//+} || ! use debug; then + local CPPFLAGS=${CPPFLAGS} append-cppflags -DNDEBUG fi fi |