[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/

[Ionen Wolkens]

commit:     6e94547eb0078c45f11eaeae2038a05cf2346f7c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 15:41:00 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 16:56:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e94547e

app-emulation/wine-staging: filter -fuse-ld for mingw

flag-o-matic is looking at respecting -fuse-ld for test-flags-CCLD,
which is good but don't want this when doing the user-unexpected
switch to mingw toolchain (filtering feels more solid either way).

Users can use CROSSLDFLAGS directly if really need full control.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/wine-staging-7.10.ebuild | 4 +++-
 app-emulation/wine-staging/wine-staging-7.11.ebuild | 4 +++-
 app-emulation/wine-staging/wine-staging-7.12.ebuild | 4 +++-
 app-emulation/wine-staging/wine-staging-7.9.ebuild  | 4 +++-
 app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-7.10.ebuild 
b/app-emulation/wine-staging/wine-staging-7.10.ebuild
index 9d69fea688ff..7c7e3938e005 100644
--- a/app-emulation/wine-staging/wine-staging-7.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.10.ebuild
@@ -360,7 +360,9 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
                : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+               : "${CROSSLDFLAGS:=$(
+                       filter-flags '-fuse-ld=*'
+                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
                export CROSS{C,LD}FLAGS
        fi
 

diff --git a/app-emulation/wine-staging/wine-staging-7.11.ebuild 
b/app-emulation/wine-staging/wine-staging-7.11.ebuild
index 9d69fea688ff..7c7e3938e005 100644
--- a/app-emulation/wine-staging/wine-staging-7.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.11.ebuild
@@ -360,7 +360,9 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
                : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+               : "${CROSSLDFLAGS:=$(
+                       filter-flags '-fuse-ld=*'
+                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
                export CROSS{C,LD}FLAGS
        fi
 

diff --git a/app-emulation/wine-staging/wine-staging-7.12.ebuild 
b/app-emulation/wine-staging/wine-staging-7.12.ebuild
index 9d69fea688ff..7c7e3938e005 100644
--- a/app-emulation/wine-staging/wine-staging-7.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.12.ebuild
@@ -360,7 +360,9 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
                : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+               : "${CROSSLDFLAGS:=$(
+                       filter-flags '-fuse-ld=*'
+                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
                export CROSS{C,LD}FLAGS
        fi
 

diff --git a/app-emulation/wine-staging/wine-staging-7.9.ebuild 
b/app-emulation/wine-staging/wine-staging-7.9.ebuild
index f4c0f73c2350..ba6a8611c8cc 100644
--- a/app-emulation/wine-staging/wine-staging-7.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.9.ebuild
@@ -360,7 +360,9 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
                : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+               : "${CROSSLDFLAGS:=$(
+                       filter-flags '-fuse-ld=*'
+                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
                export CROSS{C,LD}FLAGS
        fi
 

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 9d69fea688ff..7c7e3938e005 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -360,7 +360,9 @@ src_configure() {
                # use *FLAGS for mingw, but strip unsupported (e.g. 
--hash-style=gnu)
                local mingwcc=${CROSSCC:-$(usex x86 i686 
x86_64)-w64-mingw32-gcc}
                : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC 
${CFLAGS:--O2})}"
-               : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
+               : "${CROSSLDFLAGS:=$(
+                       filter-flags '-fuse-ld=*'
+                       CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}"
                export CROSS{C,LD}FLAGS
        fi