From: Michael Palimaka Date: Thu, 18 Dec 2014 16:39:08 +0000 (+0000) Subject: Declare local CPPFLAGS to avoid multiple appends in cmake-multilib. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a347abda1f52ee4163fbd5fc47da94fa61d497d2;p=gentoo.git Declare local CPPFLAGS to avoid multiple appends in cmake-multilib. --- 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 cmake-utils.eclass: + Declare local CPPFLAGS to avoid multiple appends in cmake-multilib. 18 Dec 2014; Davide Pesavento 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