commit:     6da4ec59b0cea1506aebfdde8d5d526a78a792b9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 18:18:55 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 18:37:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da4ec59

app-emulation/vkd3d-proton: remove old -fstack-protector workaround

mingw64-*-11 been gone for a while now.

Was originally thinking to add the same workaround as mingw64-toolchain
for -Wl,-z,* but meson does not need this. So isntead cleaning this up.

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

 app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild   | 8 +-------
 app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild | 6 ------
 app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild   | 6 ------
 app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild | 8 +-------
 app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild   | 6 ------
 5 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
index e25d27adcaa5..fb54dd38775d 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -121,12 +121,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
-                       if has_version '<dev-util/mingw64-toolchain-11' ||
-                               { use crossdev-mingw &&
-                                       has_version "<cross-$(usex x86 i686 
x86_64)-w64-mingw32/mingw64-runtime-11"; }
-                       then
-                               filter-flags '-fstack-protector*' #870136
-                       fi
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
index f57151b989e2..1eed493adf7a 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
@@ -119,12 +119,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
-                       if has_version '<dev-util/mingw64-toolchain-11' ||
-                               { use crossdev-mingw &&
-                                       has_version "<cross-$(usex x86 i686 
x86_64)-w64-mingw32/mingw64-runtime-11"; }
-                       then
-                               filter-flags '-fstack-protector*' #870136
-                       fi
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
index 594f707e519e..c107c315e595 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
@@ -125,12 +125,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
-                       if has_version '<dev-util/mingw64-toolchain-11' ||
-                               { use crossdev-mingw &&
-                                       has_version "<cross-$(usex x86 i686 
x86_64)-w64-mingw32/mingw64-runtime-11"; }
-                       then
-                               filter-flags '-fstack-protector*' #870136
-                       fi
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
index b728f3d9a94f..912055248d4b 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -116,12 +116,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
-                       if has_version '<dev-util/mingw64-toolchain-11' ||
-                               { use crossdev-mingw &&
-                                       has_version "<cross-$(usex x86 i686 
x86_64)-w64-mingw32/mingw64-runtime-11"; }
-                       then
-                               filter-flags '-fstack-protector*' #870136
-                       fi
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index f84149c6054e..3279df434dc9 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -125,12 +125,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
-                       if has_version '<dev-util/mingw64-toolchain-11' ||
-                               { use crossdev-mingw &&
-                                       has_version "<cross-$(usex x86 i686 
x86_64)-w64-mingw32/mingw64-runtime-11"; }
-                       then
-                               filter-flags '-fstack-protector*' #870136
-                       fi
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

Reply via email to