commit:     d0aad2c73522730235a71c61bcf5b644ea69e06d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 23:08:48 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 23:23:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0aad2c7

app-emulation/wine-staging: adjust mold workaround

-version worked fine but is not correct (typo), so replace it
(--version emits collect2 noise, so also add 2>/dev/null)

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

 app-emulation/wine-staging/wine-staging-7.19.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-7.20.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-7.21.ebuild | 2 +-
 app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild 
b/app-emulation/wine-staging/wine-staging-7.19.ebuild
index f5c71c97b152..f4d6cc01a97f 100644
--- a/app-emulation/wine-staging/wine-staging-7.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.19.ebuild
@@ -252,7 +252,7 @@ src_configure() {
 
        # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
        # https://github.com/gentoo/gentoo/pull/28355
-       [[ $($(tc-getCC) ${LDFLAGS} -Wl,-version) == mold* ]] &&
+       [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
                append-ldflags -fuse-ld=bfd
 
        # build using upstream's way (--with-wine64)

diff --git a/app-emulation/wine-staging/wine-staging-7.20.ebuild 
b/app-emulation/wine-staging/wine-staging-7.20.ebuild
index 53d71bdcdb01..1a7b1f25c6f9 100644
--- a/app-emulation/wine-staging/wine-staging-7.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.20.ebuild
@@ -252,7 +252,7 @@ src_configure() {
 
        # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
        # https://github.com/gentoo/gentoo/pull/28355
-       [[ $($(tc-getCC) ${LDFLAGS} -Wl,-version) == mold* ]] &&
+       [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
                append-ldflags -fuse-ld=bfd
 
        # build using upstream's way (--with-wine64)

diff --git a/app-emulation/wine-staging/wine-staging-7.21.ebuild 
b/app-emulation/wine-staging/wine-staging-7.21.ebuild
index 9a836ad59239..e3f38a33cb12 100644
--- a/app-emulation/wine-staging/wine-staging-7.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.21.ebuild
@@ -253,7 +253,7 @@ src_configure() {
 
        # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
        # https://github.com/gentoo/gentoo/pull/28355
-       [[ $($(tc-getCC) ${LDFLAGS} -Wl,-version) == mold* ]] &&
+       [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
                append-ldflags -fuse-ld=bfd
 
        # build using upstream's way (--with-wine64)

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e7201d449154..1f7740c6c6b6 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -249,7 +249,7 @@ src_configure() {
 
        # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
        # https://github.com/gentoo/gentoo/pull/28355
-       [[ $($(tc-getCC) ${LDFLAGS} -Wl,-version) == mold* ]] &&
+       [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
                append-ldflags -fuse-ld=bfd
 
        # build using upstream's way (--with-wine64)

Reply via email to