[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/files/, app-emulation/wine-staging/

[Sergei Trofimovich]

commit:     6419b3e65443b6d29c77c3ad45adb2820e0c51e3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 18:33:08 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 23:22:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6419b3e6

app-emulation/wine-staging: revert winegcc '=' parameter handling

LDFLAGS=-Wl,--defsym=__gentoo_check_ldflags__=0 causes
app-emulation/wine-staging-6.12 build failures in form of:

```
tools/winegcc/winegcc -o dlls/acledit/acledit.dll.so ... \
    -Wl,--defsym=__gentoo_check_ldflags__=0

ld:--defsym:0: syntax error
collect2: error: ld returned 1 exit status
winegcc: /usr/lib/ccache/bin/x86_64-pc-linux-gnu-gcc failed
```

The change is a revert of upstream commit fcda0afd
("winegcc: Support -Wl,foo=... style linker options.")

Bug: https://bugs.winehq.org/show_bug.cgi?id=51413
Closes: https://bugs.gentoo.org/800809
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../files/wine-staging-6.12-winegcc-equals-args.patch       | 13 +++++++++++++
 app-emulation/wine-staging/wine-staging-6.12.ebuild         |  1 +
 2 files changed, 14 insertions(+)

diff --git 
a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch 
b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
new file mode 100644
index 00000000000..562b63af063
--- /dev/null
+++ 
b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
@@ -0,0 +1,13 @@
+https://bugs.winehq.org/show_bug.cgi?id=51413
+https://bugs.gentoo.org/800809
+--- a/tools/winegcc/winegcc.c
++++ b/tools/winegcc/winegcc.c
+@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
+                     if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
+                   {
+                         unsigned int j;
+-                        strarray* Wl = strarray_fromstring(opts.args->base[i] 
+ 4, ",=");
++                        strarray* Wl = strarray_fromstring(opts.args->base[i] 
+ 4, ",");
+                         for (j = 0; j < Wl->size; j++)
+                         {
+                             if (!strcmp(Wl->base[j], "--image-base") && j < 
Wl->size - 1)

diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild 
b/app-emulation/wine-staging/wine-staging-6.12.ebuild
index 77c35e15d93..a2848d52589 100644
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
@@ -172,6 +172,7 @@ PATCHES=(
        "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
        "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
        
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+       "${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
 )
 PATCHES_BIN=()