diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-23 09:12:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-06-23 09:12:55 +0000 |
| commit | 5f12f378ed580f4a9ace6deb0dd9e13f9f8f5357 (patch) | |
| tree | 6c2fc7078bbab1af38e7f2f6f82d71156cfbce2a | |
| parent | 2019-06-23 08:24:19 UTC (diff) | |
| parent | flag-o-matic.eclass: filter out '-B/foo' and '-B /foo' equally (diff) | |
| download | gentoo-5f12f378ed580f4a9ace6deb0dd9e13f9f8f5357.tar.gz gentoo-5f12f378ed580f4a9ace6deb0dd9e13f9f8f5357.tar.bz2 gentoo-5f12f378ed580f4a9ace6deb0dd9e13f9f8f5357.zip | |
Merge updates from master
| -rw-r--r-- | eclass/flag-o-matic.eclass | 3 | ||||
| -rwxr-xr-x | eclass/tests/flag-o-matic.sh | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 933104190ae3..3b32bd9d6319 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -496,7 +496,8 @@ test-flags-PROG() { while (( $# )); do case "$1" in - --param) + # '-B /foo': bug # 687198 + --param|-B) if test-flag-${comp} "$1" "$2"; then flags+=( "$1" "$2" ) fi diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh index 97cd71d710a2..691b052c3d43 100755 --- a/eclass/tests/flag-o-matic.sh +++ b/eclass/tests/flag-o-matic.sh @@ -58,6 +58,22 @@ strip-unsupported-flags [[ ${CFLAGS} == "--param l1-cache-size=32" ]] && [[ ${CXXFLAGS} == "-z=2" ]] && [[ ${LDFLAGS} == "" ]] ftend +CFLAGS="-O2 -B/foo -O1" +CXXFLAGS="-O2 -B/foo -O1" +LDFLAGS="-O2 -B/foo -O1" +tbegin "strip-unsupported-flags for '-B/foo'" +strip-unsupported-flags +[[ ${CFLAGS} == "-O2 -O1" ]] && [[ ${CXXFLAGS} == "-O2 -O1" ]] && [[ ${LDFLAGS} == "" ]] +ftend + +CFLAGS="-O2 -B /foo -O1" +CXXFLAGS="-O2 -B /foo -O1" +LDFLAGS="-O2 -B /foo -O1" +tbegin "strip-unsupported-flags for '-B /foo'" +strip-unsupported-flags +[[ ${CFLAGS} == "-O2 -O1" ]] && [[ ${CXXFLAGS} == "-O2 -O1" ]] && [[ ${LDFLAGS} == "" ]] +ftend + for var in $(all-flag-vars) ; do eval ${var}=\"-filter -filter-glob -foo-${var%FLAGS}\" done |