Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: eclass/
Date: Sat, 10 Apr 2021 07:15:15
Message-Id: 1618038840.f5a6979fe1a87f55b485b5d20e7989330e1a7777.sam@gentoo
1 commit: f5a6979fe1a87f55b485b5d20e7989330e1a7777
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 10 07:14:00 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 10 07:14:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f5a6979f
7
8 flag-o-matic.eclass: sync with ::gentoo
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 eclass/flag-o-matic.eclass | 12 +++++-------
13 1 file changed, 5 insertions(+), 7 deletions(-)
14
15 diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
16 index f75a975a08..20ee39d98b 100644
17 --- a/eclass/flag-o-matic.eclass
18 +++ b/eclass/flag-o-matic.eclass
19 @@ -234,10 +234,7 @@ append-fflags() {
20 append-lfs-flags() {
21 [[ $# -ne 0 ]] && die "append-lfs-flags takes no arguments"
22 # see comments in filter-lfs-flags func for meaning of these
23 - case ${CHOST} in
24 - *-aix*) append-cppflags -D_LARGE_FILES -D_LARGE_FILE_API ;;
25 - *) append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE ;;
26 - esac
27 + append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
28 }
29
30 # @FUNCTION: append-ldflags
31 @@ -522,13 +519,13 @@ test-flag-PROG() {
32 "${test_in}" -o "${test_out}"
33 )
34
35 - if ! "${cmdline[@]}" </dev/null &>/dev/null; then
36 + if ! "${cmdline[@]}" &>/dev/null; then
37 # -Werror makes clang bail out on unused arguments as well;
38 # try to add -Qunused-arguments to work-around that
39 # other compilers don't support it but then, it's failure like
40 # any other
41 cmdline+=( -Qunused-arguments )
42 - "${cmdline[@]}" </dev/null &>/dev/null
43 + "${cmdline[@]}" &>/dev/null
44 fi
45 }
46
47 @@ -573,7 +570,8 @@ test-flags-PROG() {
48
49 while (( $# )); do
50 case "$1" in
51 - --param)
52 + # '-B /foo': bug # 687198
53 + --param|-B)
54 if test-flag-${comp} "$1" "$2"; then
55 flags+=( "$1" "$2" )
56 fi