diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-06-18 06:45:28 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-06-18 06:45:28 +0000 |
| commit | 1a48719d1cd181e0c7a132b3c557c846841b9a33 (patch) | |
| tree | 580a3afa6803c47b7bb5cec271a406ff38ad9915 /eclass | |
| parent | Remove old (diff) | |
| download | gentoo-2-1a48719d1cd181e0c7a132b3c557c846841b9a33.tar.gz gentoo-2-1a48719d1cd181e0c7a132b3c557c846841b9a33.tar.bz2 gentoo-2-1a48719d1cd181e0c7a132b3c557c846841b9a33.zip | |
Allow header and library paths flags in setup-allowed-flags(), bug #414641
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fbcfcbb2736d..530e35a7c6e3 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.315 2012/06/17 10:50:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.316 2012/06/18 06:45:28 grobian Exp $ + + 18 Jun 2012; Fabian Groffen <grobian@gentoo.org> flag-o-matic.eclass: + Allow header and library paths flags in setup-allowed-flags(), bug #414641 17 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass: Remove licenses prior copying docs. diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 7248660b9705..454083d5c77d 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.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/flag-o-matic.eclass,v 1.175 2012/06/05 02:16:40 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.176 2012/06/18 06:45:28 grobian Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -20,7 +20,7 @@ all-flag-vars() { echo {C,CPP,CXX,CCAS,F,FC,LD}FLAGS } -# {C,CXX,F,FC}FLAGS that we allow in strip-flags +# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags # Note: shell globs and character lists are allowed setup-allowed-flags() { ALLOWED_FLAGS="-pipe" @@ -55,6 +55,9 @@ setup-allowed-flags() { # 4.7 ALLOWED_FLAGS+=" -mno-avx2 -mno-bmi2 -mno-fma -mno-lzcnt" + # CPPFLAGS and LDFLAGS + ALLOWED_FLAGS+=" -I* -L* -R* -Wl,*" + export ALLOWED_FLAGS return 0 } @@ -344,7 +347,8 @@ filter-mfpmath() { # @FUNCTION: strip-flags # @DESCRIPTION: -# Strip C[XX]FLAGS of everything except known good/safe flags. +# Strip *FLAGS of everything except known good/safe flags. This runs over all +# flags returned by all_flag_vars(). strip-flags() { local x y var |