commit:     2c034d2d179a986b37b232221ac24cf64580fff6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 10:05:01 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 10:10:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c034d2d

app-emulation/vkd3d-proton: filter -Wl,-z,* ... for C(XX)FLAGS

strip-unsupported-flags handles this fine in LDFLAGS, but -Wl,*
are no-ops during compile-only tests (thus not stripped) and then
if a package compiles and links anything at same time it fails.

This used not to be a big problem but now that 23.0 profiles
do -Wl,-z,pack-relative-relocs (mingw ld has no -z) this is
hitting bashrc-mv users that tend to do CFLAGS="${LDFLAGS}"
by default. Tempting to ignore it because of how wrong it is,
but well.

An alternate route could be to eventually have strip-flags
and/or strip-unsupported-flags remove -Wl,* from non-LDFLAGS
given this could affect more than mingw (e.g. switching to
bfd when there is a lld-only option).

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

 app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild   | 5 +++++
 app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild | 5 +++++
 app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild   | 5 +++++
 app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild | 5 +++++
 app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild   | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
index d62c6a6a6518..a8a7ca34700f 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.10.ebuild
@@ -126,6 +126,11 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
                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 dca027f8359a..9665ed5de725 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.11.1.ebuild
@@ -124,6 +124,11 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
                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 1190df8cfcb2..98a5935850ad 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
@@ -130,6 +130,11 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
                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 32e103ce091f..9a41d28143b1 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
@@ -121,6 +121,11 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
                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 5f2131de62c5..12ec38649be1 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -130,6 +130,11 @@ src_configure() {
                        unset AR CC CXX RC STRIP WIDL
                        filter-flags '-fuse-ld=*'
                        filter-flags '-mfunction-return=thunk*' #878849
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
                fi
 
                CHOST_amd64=x86_64-w64-mingw32

Reply via email to