From 1488a84006186e01e232fd137654ab714365b202 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 May 2019 23:42:53 +0100 Subject: [PATCH] app-emulation/wine{-any,-d3d,-staging,-vanilla,}: disable automagic mingw detection, bug #685172 wine-4.7 now detects mingw presence when possible. Unfortunately LDFLAGS filtering does not happen and wine build fails as: /usr/libexec/gcc/i686-w64-mingw32/ld: unrecognized option '--hash-style=gnu' The fix is to disable with '--without-mingw' configure option. Bug: https://bugs.gentoo.org/685172 Signed-off-by: Sergei Trofimovich --- app-emulation/wine-any/wine-any-9999.ebuild | 1 + app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 1 + app-emulation/wine-staging/wine-staging-4.7-r1.ebuild | 1 + app-emulation/wine-staging/wine-staging-9999.ebuild | 1 + app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild | 1 + app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 1 + app-emulation/wine/wine-9999.ebuild | 1 + 7 files changed, 7 insertions(+) diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index d5fcb84..30eb8fe 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -476,6 +476,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild index f9e7a4e..d199711 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild @@ -420,6 +420,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild index c7cd40a..29ab363 100644 --- a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild @@ -456,6 +456,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index c7cd40a..29ab363 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -456,6 +456,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild index a10f0dc..d14473c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild @@ -387,6 +387,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index a10f0dc..d14473c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -387,6 +387,7 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 16495a9..e38f49e 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -435,6 +435,7 @@ multilib_src_configure() { --without-hal $(use_with jpeg) $(use_with ldap) + --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) -- 2.21.0