diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-03 04:55:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-03 04:55:31 +0000 |
| commit | 4c8f7be037c64e422ab70cff703c0f4990f80253 (patch) | |
| tree | cfa42bc2a1fdacec15a0e9101cec6fa22844e996 /app-emulation | |
| parent | Old versions of geramik are unmaintainable too (diff) | |
| download | gentoo-2-4c8f7be037c64e422ab70cff703c0f4990f80253.tar.gz gentoo-2-4c8f7be037c64e422ab70cff703c0f4990f80253.tar.bz2 gentoo-2-4c8f7be037c64e422ab70cff703c0f4990f80253.zip | |
Make sure winegcc passes -m32/-m64 along to the linker #100180.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-20050725-gcc-32bit.patch | 11 | ||||
| -rw-r--r-- | app-emulation/wine/wine-20050524.ebuild | 3 | ||||
| -rw-r--r-- | app-emulation/wine/wine-20050628.ebuild | 3 | ||||
| -rw-r--r-- | app-emulation/wine/wine-20050725.ebuild | 3 |
5 files changed, 23 insertions, 4 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/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() { |