[gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-toolchain/

[Ionen Wolkens]

commit:     6087ef400265ab5a85bff365e0ba370a55da8e47
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 22:22:19 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 23:10:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6087ef40

Revert "Revert "dev-util/mingw64-toolchain: filter ssp for cross mingw""

This reverts commit d06a9cf2f29ca13694007493173a9ebe304005de.

This turned out to be fine, was misled that it may have leaked
to gcc's own libraries rather than just mingw's crt.

Still require filtering ssp on every mingw packages though,
strip-unsupported-flags can't pickup that this will fail with
a basic `int main(void) { return 0; }` compiler test.

Closes: https://bugs.gentoo.org/870136
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild | 1 +
 dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild 
b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
index 0bfc818d9698..59a0022ee10b 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild
@@ -187,6 +187,7 @@ src_compile() {
                                # cross-compiling, cleanup and let ./configure 
handle it
                                unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP 
RANLIB RC STRIP
                                CHOST=${CTARGET}
+                               filter-flags '-fstack-protector*' #870136
                                filter-flags '-fuse-ld=*'
                                strip-unsupported-flags
                                mwt-build "${@:2}"

diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild 
b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
index 3b878de762bf..4ad2c7cf514f 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild
@@ -188,6 +188,7 @@ src_compile() {
                                # cross-compiling, cleanup and let ./configure 
handle it
                                unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP 
RANLIB RC STRIP
                                CHOST=${CTARGET}
+                               filter-flags '-fstack-protector*' #870136
                                filter-flags '-fuse-ld=*'
                                strip-unsupported-flags
                                mwt-build "${@:2}"