| 1 |
commit: 6419b3e65443b6d29c77c3ad45adb2820e0c51e3 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 18:33:08 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 16 23:22:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6419b3e6 |
| 7 |
|
| 8 |
app-emulation/wine-staging: revert winegcc '=' parameter handling |
| 9 |
|
| 10 |
LDFLAGS=-Wl,--defsym=__gentoo_check_ldflags__=0 causes |
| 11 |
app-emulation/wine-staging-6.12 build failures in form of: |
| 12 |
|
| 13 |
``` |
| 14 |
tools/winegcc/winegcc -o dlls/acledit/acledit.dll.so ... \ |
| 15 |
-Wl,--defsym=__gentoo_check_ldflags__=0 |
| 16 |
|
| 17 |
ld:--defsym:0: syntax error |
| 18 |
collect2: error: ld returned 1 exit status |
| 19 |
winegcc: /usr/lib/ccache/bin/x86_64-pc-linux-gnu-gcc failed |
| 20 |
``` |
| 21 |
|
| 22 |
The change is a revert of upstream commit fcda0afd |
| 23 |
("winegcc: Support -Wl,foo=... style linker options.") |
| 24 |
|
| 25 |
Bug: https://bugs.winehq.org/show_bug.cgi?id=51413 |
| 26 |
Closes: https://bugs.gentoo.org/800809 |
| 27 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 28 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 29 |
|
| 30 |
.../files/wine-staging-6.12-winegcc-equals-args.patch | 13 +++++++++++++ |
| 31 |
app-emulation/wine-staging/wine-staging-6.12.ebuild | 1 + |
| 32 |
2 files changed, 14 insertions(+) |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..562b63af063 |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch |
| 39 |
@@ -0,0 +1,13 @@ |
| 40 |
+https://bugs.winehq.org/show_bug.cgi?id=51413 |
| 41 |
+https://bugs.gentoo.org/800809 |
| 42 |
+--- a/tools/winegcc/winegcc.c |
| 43 |
++++ b/tools/winegcc/winegcc.c |
| 44 |
+@@ -1982,7 +1982,7 @@ int main(int argc, char **argv) |
| 45 |
+ if (strncmp("-Wl,", opts.args->base[i], 4) == 0) |
| 46 |
+ { |
| 47 |
+ unsigned int j; |
| 48 |
+- strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",="); |
| 49 |
++ strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ","); |
| 50 |
+ for (j = 0; j < Wl->size; j++) |
| 51 |
+ { |
| 52 |
+ if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1) |
| 53 |
|
| 54 |
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 55 |
index 77c35e15d93..a2848d52589 100644 |
| 56 |
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 57 |
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 58 |
@@ -172,6 +172,7 @@ PATCHES=( |
| 59 |
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 |
| 60 |
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 |
| 61 |
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" |
| 62 |
+ "${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809 |
| 63 |
) |
| 64 |
PATCHES_BIN=() |
Archives