commit:     ca1ee765901662ea2f7b3d3710f8f9f84feba095
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 18:16:38 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=ca1ee765

app-emulation/dxvk: 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/dxvk/dxvk-1.10.3-r1.ebuild | 8 +-------
 app-emulation/dxvk/dxvk-2.2-r1.ebuild    | 6 ------
 app-emulation/dxvk/dxvk-2.3.1.ebuild     | 6 ------
 app-emulation/dxvk/dxvk-2.3.ebuild       | 6 ------
 app-emulation/dxvk/dxvk-9999.ebuild      | 6 ------
 5 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild 
b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
index 3a56e2fdd338..7c21ed2aab38 100644
--- a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3-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
@@ -79,12 +79,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP
                        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/dxvk/dxvk-2.2-r1.ebuild 
b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
index 0b08fa5c5d86..4a1b3cefe2ca 100644
--- a/app-emulation/dxvk/dxvk-2.2-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
@@ -103,12 +103,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP
                        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/dxvk/dxvk-2.3.1.ebuild 
b/app-emulation/dxvk/dxvk-2.3.1.ebuild
index 4a3b8f982943..fb132f4d809f 100644
--- a/app-emulation/dxvk/dxvk-2.3.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.1.ebuild
@@ -106,12 +106,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP
                        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/dxvk/dxvk-2.3.ebuild 
b/app-emulation/dxvk/dxvk-2.3.ebuild
index 90f66f2217d7..ab5c0b7cb913 100644
--- a/app-emulation/dxvk/dxvk-2.3.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.ebuild
@@ -103,12 +103,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP
                        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/dxvk/dxvk-9999.ebuild 
b/app-emulation/dxvk/dxvk-9999.ebuild
index e890aec12fbd..231f81d0ebed 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -106,12 +106,6 @@ src_configure() {
                        unset AR CC CXX RC STRIP
                        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