diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-07-16 11:41:00 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-07-16 12:56:36 -0400 |
| commit | 6e94547eb0078c45f11eaeae2038a05cf2346f7c (patch) | |
| tree | 4977db036cb2908cc78b0a5c492cc017e45f21b8 /app-emulation | |
| parent | app-emulation/wine-vanilla: filter -fuse-ld for mingw (diff) | |
| download | gentoo-6e94547eb0078c45f11eaeae2038a05cf2346f7c.tar.gz gentoo-6e94547eb0078c45f11eaeae2038a05cf2346f7c.tar.bz2 gentoo-6e94547eb0078c45f11eaeae2038a05cf2346f7c.zip | |
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@gentoo.org>
Diffstat (limited to 'app-emulation')
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 |