diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-09-14 18:29:24 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-09-14 19:10:17 -0400 |
| commit | a6f1340476d5f95c8cbd7980226296e60a39d567 (patch) | |
| tree | dbfb7afc5ce5b6867a80d9b957706575ee05733d /app-emulation | |
| parent | Revert "Revert "dev-util/mingw64-toolchain: filter ssp for cross mingw"" (diff) | |
| download | gentoo-a6f1340476d5f95c8cbd7980226296e60a39d567.tar.gz gentoo-a6f1340476d5f95c8cbd7980226296e60a39d567.tar.bz2 gentoo-a6f1340476d5f95c8cbd7980226296e60a39d567.zip | |
app-emulation/wine-vanilla: filter ssp for mingw
Bug: https://bugs.gentoo.org/870136
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-emulation')
4 files changed, 12 insertions, 4 deletions
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild index 4e2874f98385..8647193f3913 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild @@ -298,7 +298,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})}" + : "${CROSSCFLAGS:=$( + filter-flags '-fstack-protector*' #870136 + CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild index 7a2564b15a56..86104f6903a5 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r3.ebuild @@ -245,7 +245,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) if use mingw; then - : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" + : "${CROSSCFLAGS:=$( + filter-flags '-fstack-protector*' #870136 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild index f0f96f49dcfd..ac4a2a6be890 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.17.ebuild @@ -243,7 +243,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) if use mingw; then - : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" + : "${CROSSCFLAGS:=$( + filter-flags '-fstack-protector*' #870136 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index f0f96f49dcfd..ac4a2a6be890 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -243,7 +243,9 @@ src_configure() { # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) if use mingw; then - : "${CROSSCFLAGS:=$(CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" + : "${CROSSCFLAGS:=$( + filter-flags '-fstack-protector*' #870136 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" |