From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0DA921381F3 for ; Mon, 30 Sep 2013 06:40:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D52CE0BF6; Mon, 30 Sep 2013 06:39:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 984AEE0BF6 for ; Mon, 30 Sep 2013 06:39:58 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF76E33ED39 for ; Mon, 30 Sep 2013 06:39:57 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 4EED82004C; Mon, 30 Sep 2013 06:39:56 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: flag-o-matic.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: flag-o-matic.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130930063956.4EED82004C@flycatcher.gentoo.org> Date: Mon, 30 Sep 2013 06:39:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc44d1a4-dbae-4ecf-beff-b6fa0752e955 X-Archives-Hash: a99aa7f64a9ab47948e7c412f7236a83 vapier 13/09/30 06:39:56 Modified: flag-o-matic.eclass Log: append-*flags: revert to old behavior where we always append the flags specified rather than doing testing on them; it is not feasible to handle flags that have spaces in them #417047 Revision Changes Path 1.189 eclass/flag-o-matic.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.189&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.189&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.188&r2=1.189 Index: flag-o-matic.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- flag-o-matic.eclass 5 Sep 2013 05:28:01 -0000 1.188 +++ flag-o-matic.eclass 30 Sep 2013 06:39:56 -0000 1.189 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.188 2013/09/05 05:28:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.189 2013/09/30 06:39:56 vapier Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -144,38 +144,53 @@ # Add extra to the current CPPFLAGS. append-cppflags() { [[ $# -eq 0 ]] && return 0 - export CPPFLAGS="${CPPFLAGS} $*" + export CPPFLAGS+=" $*" return 0 } # @FUNCTION: append-cflags # @USAGE: # @DESCRIPTION: -# Add extra to the current CFLAGS. +# Add extra to the current CFLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-CC like so: +# @CODE +# append-cflags $(test-flags-CC -funky-flag) +# @CODE append-cflags() { [[ $# -eq 0 ]] && return 0 - export CFLAGS=$(test-flags-CC ${CFLAGS} "$@") + # Do not do automatic flag testing ourselves. #417047 + export CFLAGS+=" $*" return 0 } # @FUNCTION: append-cxxflags # @USAGE: # @DESCRIPTION: -# Add extra to the current CXXFLAGS. +# Add extra to the current CXXFLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-CXX like so: +# @CODE +# append-cxxflags $(test-flags-CXX -funky-flag) +# @CODE append-cxxflags() { [[ $# -eq 0 ]] && return 0 - export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS} "$@") + # Do not do automatic flag testing ourselves. #417047 + export CXXFLAGS+=" $*" return 0 } # @FUNCTION: append-fflags # @USAGE: # @DESCRIPTION: -# Add extra to the current {F,FC}FLAGS. +# Add extra to the current {F,FC}FLAGS. If a flag might not be supported +# with different compilers (or versions), then use test-flags-F77 like so: +# @CODE +# append-fflags $(test-flags-F77 -funky-flag) +# @CODE append-fflags() { [[ $# -eq 0 ]] && return 0 - export FFLAGS=$(test-flags-F77 ${FFLAGS} "$@") - export FCFLAGS=$(test-flags-FC ${FCFLAGS} "$@") + # Do not do automatic flag testing ourselves. #417047 + export FFLAGS+=" $*" + export FCFLAGS+=" $*" return 0 }