/[gentoo-x86]/eclass/flag-o-matic.eclass
Gentoo

Diff of /eclass/flag-o-matic.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.166 Revision 1.167
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.166 2012/01/14 08:22:13 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.167 2012/01/14 09:10:54 vapier Exp $
4 4
5# @ECLASS: flag-o-matic.eclass 5# @ECLASS: flag-o-matic.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# toolchain@gentoo.org 7# toolchain@gentoo.org
8# @BLURB: common functions to manipulate and query toolchain flags 8# @BLURB: common functions to manipulate and query toolchain flags
12 12
13if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then 13if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then
14___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank" 14___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank"
15 15
16inherit eutils toolchain-funcs multilib 16inherit eutils toolchain-funcs multilib
17
18# Return all the flag variables that our high level funcs operate on.
19all-flag-vars() {
20 echo {C,CPP,CXX,F,FC,LD}FLAGS
21}
17 22
18# {C,CXX,F,FC}FLAGS that we allow in strip-flags 23# {C,CXX,F,FC}FLAGS that we allow in strip-flags
19# Note: shell globs and character lists are allowed 24# Note: shell globs and character lists are allowed
20setup-allowed-flags() { 25setup-allowed-flags() {
21 ALLOWED_FLAGS="-pipe" 26 ALLOWED_FLAGS="-pipe"
78 83
79# Remove occurrences of strings from variable given in $1 84# Remove occurrences of strings from variable given in $1
80# Strings removed are matched as globs, so for example 85# Strings removed are matched as globs, so for example
81# '-O*' would remove -O1, -O2 etc. 86# '-O*' would remove -O1, -O2 etc.
82_filter-var() { 87_filter-var() {
83 local f x VAR VAL 88 local f x var=$1 new=()
84 declare -a new
85
86 VAR=$1
87 shift 89 shift
88 eval VAL=\${${VAR}} 90
89 for f in ${VAL}; do 91 for f in ${!var} ; do
90 for x in "$@"; do 92 for x in "$@" ; do
91 # Note this should work with globs like -O* 93 # Note this should work with globs like -O*
92 [[ ${f} == ${x} ]] && continue 2 94 [[ ${f} == ${x} ]] && continue 2
93 done 95 done
94 eval new\[\${\#new\[@]}]=\${f} 96 new+=( "${f}" )
95 done 97 done
96 eval export ${VAR}=\${new\[*]} 98 eval export ${var}=\""${new[*]}"\"
97} 99}
98 100
99# @FUNCTION: filter-flags 101# @FUNCTION: filter-flags
100# @USAGE: <flags> 102# @USAGE: <flags>
101# @DESCRIPTION: 103# @DESCRIPTION:
102# Remove particular <flags> from {C,CPP,CXX,F,FC,LD}FLAGS. Accepts shell globs. 104# Remove particular <flags> from {C,CPP,CXX,F,FC,LD}FLAGS. Accepts shell globs.
103filter-flags() { 105filter-flags() {
104 _filter-hardened "$@" 106 _filter-hardened "$@"
105 local v 107 local v
106 for v in C CPP CXX F FC LD ; do 108 for v in $(all-flag-vars) ; do
107 _filter-var ${v}FLAGS "$@" 109 _filter-var ${v} "$@"
108 done 110 done
109 return 0 111 return 0
110} 112}
111 113
112# @FUNCTION: filter-lfs-flags 114# @FUNCTION: filter-lfs-flags
186# @FUNCTION: replace-flags 188# @FUNCTION: replace-flags
187# @USAGE: <old> <new> 189# @USAGE: <old> <new>
188# @DESCRIPTION: 190# @DESCRIPTION:
189# Replace the <old> flag with <new>. Accepts shell globs for <old>. 191# Replace the <old> flag with <new>. Accepts shell globs for <old>.
190replace-flags() { 192replace-flags() {
191 [[ $# != 2 ]] \
192 && echo && eerror "Usage: replace-flags <old flag> <new flag>" \ 193 [[ $# != 2 ]] && die "Usage: replace-flags <old flag> <new flag>"
193 && die "replace-flags takes 2 arguments, not $#"
194 194
195 local f fset 195 local f var new
196 declare -a new_CFLAGS new_CXXFLAGS new_FFLAGS new_FCFLAGS 196 for var in $(all-flag-vars) ; do
197
198 for fset in CFLAGS CXXFLAGS FFLAGS FCFLAGS; do
199 # Looping over the flags instead of using a global 197 # Looping over the flags instead of using a global
200 # substitution ensures that we're working with flag atoms. 198 # substitution ensures that we're working with flag atoms.
201 # Otherwise globs like -O* have the potential to wipe out the 199 # Otherwise globs like -O* have the potential to wipe out the
202 # list of flags. 200 # list of flags.
201 new=()
203 for f in ${!fset}; do 202 for f in ${!var} ; do
204 # Note this should work with globs like -O* 203 # Note this should work with globs like -O*
205 [[ ${f} == ${1} ]] && f=${2} 204 [[ ${f} == ${1} ]] && f=${2}
206 eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f} 205 new+=( "${f}" )
207 done 206 done
208 eval export ${fset}=\${new_${fset}\[*]} 207 eval export ${var}=\""${new[*]}"\"
209 done 208 done
210 209
211 return 0 210 return 0
212} 211}
213 212
241# @USAGE: <flag> 240# @USAGE: <flag>
242# @DESCRIPTION: 241# @DESCRIPTION:
243# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs. 242# Returns shell true if <flag> is in {C,CXX,F,FC}FLAGS, else returns shell false. Accepts shell globs.
244is-flagq() { 243is-flagq() {
245 [[ -n $2 ]] && die "Usage: is-flag <flag>" 244 [[ -n $2 ]] && die "Usage: is-flag <flag>"
246 _is_flagq CFLAGS $1 || _is_flagq CXXFLAGS $1 || _is_flagq FFLAGS $1 || _is_flagq FCFLAGS $1 245
246 local var
247 for var in $(all-flag-vars) ; do
248 _is_flagq ${var} "$1" && return 0
249 done
250 return 1
247} 251}
248 252
249# @FUNCTION: is-flag 253# @FUNCTION: is-flag
250# @USAGE: <flag> 254# @USAGE: <flag>
251# @DESCRIPTION: 255# @DESCRIPTION:
307 311
308# @FUNCTION: strip-flags 312# @FUNCTION: strip-flags
309# @DESCRIPTION: 313# @DESCRIPTION:
310# Strip C[XX]FLAGS of everything except known good/safe flags. 314# Strip C[XX]FLAGS of everything except known good/safe flags.
311strip-flags() { 315strip-flags() {
312 local x y flag NEW_CFLAGS NEW_CXXFLAGS NEW_FFLAGS NEW_FCFLAGS 316 local x y var
313 317
314 setup-allowed-flags 318 setup-allowed-flags
315 319
316 local NEW_CFLAGS=""
317 local NEW_CXXFLAGS=""
318 local NEW_FFLAGS=""
319 local NEW_FCFLAGS=""
320
321 set -f # disable pathname expansion 320 set -f # disable pathname expansion
322 321
323 for x in ${CFLAGS}; do 322 for var in $(all-flag-vars) ; do
323 local new=()
324
325 for x in ${!var} ; do
326 local flag=${x%%=*}
324 for y in ${ALLOWED_FLAGS}; do 327 for y in ${ALLOWED_FLAGS} ; do
325 flag=${x%%=*}
326 if [ "${flag%%${y}}" = "" ] ; then 328 if [[ -z ${flag%%${y}} ]] ; then
327 NEW_CFLAGS="${NEW_CFLAGS} ${x}" 329 new+=( "${x}" )
328 break 330 break
329 fi 331 fi
330 done 332 done
331 done 333 done
332 334
333 for x in ${CXXFLAGS}; do
334 for y in ${ALLOWED_FLAGS}; do
335 flag=${x%%=*}
336 if [ "${flag%%${y}}" = "" ] ; then
337 NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
338 break
339 fi
340 done
341 done
342
343 for x in ${FFLAGS}; do
344 for y in ${ALLOWED_FLAGS}; do
345 flag=${x%%=*}
346 if [ "${flag%%${y}}" = "" ] ; then
347 NEW_FFLAGS="${NEW_FFLAGS} ${x}"
348 break
349 fi
350 done
351 done
352
353 for x in ${FCFLAGS}; do
354 for y in ${ALLOWED_FLAGS}; do
355 flag=${x%%=*}
356 if [ "${flag%%${y}}" = "" ] ; then
357 NEW_FCFLAGS="${NEW_FCFLAGS} ${x}"
358 break
359 fi
360 done
361 done
362
363 # In case we filtered out all optimization flags fallback to -O2 335 # In case we filtered out all optimization flags fallback to -O2
364 if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then 336 if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then
365 NEW_CFLAGS="${NEW_CFLAGS} -O2" 337 new+=( -O2 )
366 fi 338 fi
367 if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then 339
368 NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2" 340 eval export ${var}=\""${new[*]}"\"
369 fi 341 done
370 if [ "${FFLAGS/-O}" != "${FFLAGS}" -a "${NEW_FFLAGS/-O}" = "${NEW_FFLAGS}" ]; then
371 NEW_FFLAGS="${NEW_FFLAGS} -O2"
372 fi
373 if [ "${FCFLAGS/-O}" != "${FCFLAGS}" -a "${NEW_FCFLAGS/-O}" = "${NEW_FCFLAGS}" ]; then
374 NEW_FCFLAGS="${NEW_FCFLAGS} -O2"
375 fi
376 342
377 set +f # re-enable pathname expansion 343 set +f # re-enable pathname expansion
378 344
379 export CFLAGS="${NEW_CFLAGS}"
380 export CXXFLAGS="${NEW_CXXFLAGS}"
381 export FFLAGS="${NEW_FFLAGS}"
382 export FCFLAGS="${NEW_FCFLAGS}"
383 return 0 345 return 0
384} 346}
385 347
386test-flag-PROG() { 348test-flag-PROG() {
387 local comp=$1 349 local comp=$1
495# @FUNCTION: get-flag 457# @FUNCTION: get-flag
496# @USAGE: <flag> 458# @USAGE: <flag>
497# @DESCRIPTION: 459# @DESCRIPTION:
498# Find and echo the value for a particular flag. Accepts shell globs. 460# Find and echo the value for a particular flag. Accepts shell globs.
499get-flag() { 461get-flag() {
500 local f findflag="$1" 462 local f var findflag="$1"
501 463
502 # this code looks a little flaky but seems to work for 464 # this code looks a little flaky but seems to work for
503 # everything we want ... 465 # everything we want ...
504 # for example, if CFLAGS="-march=i686": 466 # for example, if CFLAGS="-march=i686":
505 # `get-flag -march` == "-march=i686" 467 # `get-flag -march` == "-march=i686"
506 # `get-flag march` == "i686" 468 # `get-flag march` == "i686"
507 for f in ${CFLAGS} ${CXXFLAGS} ${FFLAGS} ${FCFLAGS} ; do 469 for var in $(all-flag-vars) ; do
470 for f in ${!var} ; do
508 if [ "${f/${findflag}}" != "${f}" ] ; then 471 if [ "${f/${findflag}}" != "${f}" ] ; then
509 printf "%s\n" "${f/-${findflag}=}" 472 printf "%s\n" "${f/-${findflag}=}"
510 return 0 473 return 0
511 fi 474 fi
475 done
512 done 476 done
513 return 1 477 return 1
514} 478}
515 479
516# @FUNCTION: has_m64 480# @FUNCTION: has_m64

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.167

  ViewVC Help
Powered by ViewVC 1.1.20