Make sure winegcc passes -m32/-m64 along to the linker #100180.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 31 insertions, 11 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 58bb92a4d241..73c9af94fa83 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.100 2005/07/26 05:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.101 2005/08/03 04:55:31 vapier Exp $
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-20050725-gcc-32bit.patch, wine-20050524.ebuild,
+  wine-20050628.ebuild, wine-20050725.ebuild:
+  Make sure winegcc passes -m32/-m64 along to the linker #100180.
 
 *wine-20050725 (26 Jul 2005)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2fde584b3470..85c7206c9977 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -5,11 +5,11 @@ MD5 e1a9905badd6b1dd04475bff5192a5ea wine-20050211.ebuild 3694
 MD5 78ac9fb3899d394660847472ce498bbe wine-20050111-r1.ebuild 3189
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
 MD5 6a9d1b8a62247f69feb3baf365dcc622 wine-20050419.ebuild 3644
-MD5 45e52058e54270c9ed66fe0c0314bd12 wine-20050628.ebuild 3713
-MD5 2b35dc3beb569e1c6022b7c53e4ef2ca wine-20050725.ebuild 3713
+MD5 6b9fd7a4507c6219a21ea7a649d163c7 wine-20050628.ebuild 3765
+MD5 610f1c433f8cbc575426f343da207256 wine-20050725.ebuild 3765
 MD5 192c6321bcdd9cdc5f8c36e6ea685264 wine-20041019-r3.ebuild 2984
-MD5 54ebcb49f6be8b51a7b1542e0fa4f1ec ChangeLog 17840
-MD5 6307c76de271061e3164d75b098972e1 wine-20050524.ebuild 3711
+MD5 9d3f39af13e27a737f63a6a6ce54ee23 ChangeLog 18065
+MD5 233893122da70d84859241114ff0f7cf wine-20050524.ebuild 3763
 MD5 b1e7cdf7b9754ec4db8b4915fd686520 wine-20050310-r1.ebuild 3710
 MD5 9d19cae37895df966e850d3054ef2513 files/digest-wine-20050419 67
 MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r1 67
@@ -24,12 +24,13 @@ MD5 73a9223d839cbaa35c2497dd40a17015 files/digest-wine-20050628 67
 MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257
 MD5 f9ded3113cb95a488a47c43fcd71467b files/digest-wine-20050524 67
 MD5 03f968d969bdc86d7afd384b026aa7cf files/digest-wine-20050310-r1 67
+MD5 911ab19b2f76abd8034c35fc86104ee0 files/wine-20050725-gcc-32bit.patch 374
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 45243901331840c35f12426a17b31bd2 files/wine-20050310-upstream-colortable.patch 1546
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC5cj9gIKl8Uu19MoRAsIRAJ936vPbDQ4wodwjfRMnVAHAPdPKiQCfeCoK
-DV8yDC1V1Y/DiF7qNb01nrc=
-=nq/9
+iD8DBQFC8E5YgIKl8Uu19MoRAvvEAJ9I95v/yyfKsRjryOLoZ/W4cfjhjACdEpp3
+gmY4OBknAHsEGHr2xnFNFF0=
+=n3P1
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-20050725-gcc-32bit.patch b/app-emulation/wine/files/wine-20050725-gcc-32bit.patch
new file mode 100644
index 000000000000..ae3ed1726be4
--- /dev/null
+++ b/app-emulation/wine/files/wine-20050725-gcc-32bit.patch
@@ -0,0 +1,11 @@
+--- tools/winegcc/winegcc.c
++++ tools/winegcc/winegcc.c
+@@ -863,6 +863,8 @@
+ 			opts.gui_app = 1;
+ 		    else if (strcmp("-mconsole", argv[i]) == 0)
+ 			opts.gui_app = 0;
++		    else if (strcmp("-m32", argv[i]) == 0 || strcmp("-m64", argv[i]) == 0)
++			raw_linker_arg = 1;
+ 		    break;
+                 case 'n':
+                     if (strcmp("-nostdinc", argv[i]) == 0)
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index 9193e3a228d6..2396cd1c42dc 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.7 2005/07/19 04:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.8 2005/08/03 04:55:31 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -65,6 +65,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 }
 
 config_cache() {
diff --git a/app-emulation/wine/wine-20050628.ebuild b/app-emulation/wine/wine-20050628.ebuild
index 674f6261de46..16fa44d176e1 100644
--- a/app-emulation/wine/wine-20050628.ebuild
+++ b/app-emulation/wine/wine-20050628.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.2 2005/07/19 04:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.3 2005/08/03 04:55:31 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 }
 
 config_cache() {
diff --git a/app-emulation/wine/wine-20050725.ebuild b/app-emulation/wine/wine-20050725.ebuild
index 15801cf7dbc9..af57cc59207d 100644
--- a/app-emulation/wine/wine-20050725.ebuild
+++ b/app-emulation/wine/wine-20050725.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725.ebuild,v 1.1 2005/07/26 05:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725.ebuild,v 1.2 2005/08/03 04:55:31 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/20041019-no-stack.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 }
 
 config_cache() {