commit: d81328321dcf1cd1e41a9b9c5db776b521724903 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Mon Apr 18 01:33:18 2016 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Tue Apr 19 17:07:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8132832
app-emulation/wine: Convert wine-1.9.5-multilib-portage.patch to -p1 Package-Manager: portage-2.2.26 app-emulation/wine/files/wine-1.9.5-multilib-portage.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch index 2166865..c19d0d8 100644 --- a/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch +++ b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch @@ -1,5 +1,14 @@ ---- configure.ac.orig 2016-03-05 20:53:50.574628728 -0500 -+++ configure.ac 2016-03-05 20:57:54.945617833 -0500 +https://bugs.gentoo.org/show_bug.cgi?id=395615 + +Explicitly add the required -m32/m64 to *FLAGS; this overrides any +arch-specific -m* flags that may have been appended by multilib-portage. + +Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be +explicitly added to CC and CXX due to wine's build system. For example, +winegcc saves the build-time value of CC and uses it at runtime. + +--- a/configure.ac 2016-03-05 20:53:50.574628728 -0500 ++++ b/configure.ac 2016-03-05 20:57:54.945617833 -0500 @@ -141,6 +141,9 @@ then CC="$CC -m32"
