diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2006-06-11 01:30:15 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-06-11 01:30:15 +0000 |
| commit | 623c1844abab4788e9b0aca03bb47498dfaa278f (patch) | |
| tree | cec76fb17ab8de0c66776a408bf13baaee40a2c6 /app-emulation | |
| parent | Bump for gcc-4.1.1 support. Also disables libssp/libmudflap/libgcj/nls that w... (diff) | |
| download | historical-623c1844abab4788e9b0aca03bb47498dfaa278f.tar.gz historical-623c1844abab4788e9b0aca03bb47498dfaa278f.tar.bz2 historical-623c1844abab4788e9b0aca03bb47498dfaa278f.zip | |
Fixed (again) to compile properly on amd64 with eselect-compiler. Closes bug #128772.
Package-Manager: portage-2.1_rc4-r4
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/Manifest | 22 | ||||
| -rw-r--r-- | app-emulation/wine/wine-0.9.15.ebuild | 17 |
2 files changed, 28 insertions, 11 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index b6fcc769e66b..c34fc4970b3d 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -124,10 +124,10 @@ EBUILD wine-0.9.14.ebuild 3504 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 S MD5 f4529ad5ee3a65bec4e6012c1bcd9feb wine-0.9.14.ebuild 3504 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 wine-0.9.14.ebuild 3504 SHA256 78e15296858a473a146ff83cddfd7085faa64b496995b5221fdb4969727dd6af wine-0.9.14.ebuild 3504 -EBUILD wine-0.9.15.ebuild 3545 RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b SHA1 7eaa62aea571c753092569783f729e8ac4b3fb9a SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3 -MD5 6c600ecba85953e8da3d7d5957e4f239 wine-0.9.15.ebuild 3545 -RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b wine-0.9.15.ebuild 3545 -SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3 wine-0.9.15.ebuild 3545 +EBUILD wine-0.9.15.ebuild 3865 RMD160 5b71ab818ffdd8e015d0bcbe47b073fa73b505ea SHA1 0286aa1e425b57b9a517418c982cbc5b844357fc SHA256 34851d43c6fb896f57d32b956491b2941ddbfeaf8feaa664ab25f326ca6a2f75 +MD5 bc22f2a36ad9280d954e772446bfbda0 wine-0.9.15.ebuild 3865 +RMD160 5b71ab818ffdd8e015d0bcbe47b073fa73b505ea wine-0.9.15.ebuild 3865 +SHA256 34851d43c6fb896f57d32b956491b2941ddbfeaf8feaa664ab25f326ca6a2f75 wine-0.9.15.ebuild 3865 EBUILD wine-0.9.2.ebuild 4161 RMD160 32af02785815020bd693318786246cd46ea8107b SHA1 dd7227f031650079f361acd77b55e7b13761ee29 SHA256 aa516a61dd7eaa622a5b0e8cd74646371371f13a2118cf6989f88eb7a75e2268 MD5 0e8a939a0799b82181ee17f084caf7eb wine-0.9.2.ebuild 4161 RMD160 32af02785815020bd693318786246cd46ea8107b wine-0.9.2.ebuild 4161 @@ -216,6 +216,14 @@ MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331df MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791 SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018 metadata.xml 791 +MISC wine-0.9.15.ebuild.orig 3545 RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b SHA1 7eaa62aea571c753092569783f729e8ac4b3fb9a SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3 +MD5 6c600ecba85953e8da3d7d5957e4f239 wine-0.9.15.ebuild.orig 3545 +RMD160 9c75fafec3b29844898d4ff808c7be20079e3c0b wine-0.9.15.ebuild.orig 3545 +SHA256 5ed50840595183113b55478b39ff86ef4d8fbb7d63eba86a30ab76c6f1a3dde3 wine-0.9.15.ebuild.orig 3545 +MISC wine-0.9.15.ebuild.rej 2081 RMD160 1513dcef21e160894bc2e43b4c88c6593eb6364f SHA1 ae678ed47f690447b1037792f254dceab71d6964 SHA256 0221015eb7569704d5ac7ebae4b17b3131e3527015a48b206f2b8c579c950bb9 +MD5 100700754d40e494dc7a33808e6d8414 wine-0.9.15.ebuild.rej 2081 +RMD160 1513dcef21e160894bc2e43b4c88c6593eb6364f wine-0.9.15.ebuild.rej 2081 +SHA256 0221015eb7569704d5ac7ebae4b17b3131e3527015a48b206f2b8c579c950bb9 wine-0.9.15.ebuild.rej 2081 MD5 e7f4e3a7d72b4021aab616083f0c39aa files/digest-wine-0.9 235 RMD160 5dae43fb3a4957e367a302f13e63bfe53d8b10a7 files/digest-wine-0.9 235 SHA256 9115cf8d7ef53d9816bfd811e0601e85c0742ae8392bc9ccb65dc743479abfb1 files/digest-wine-0.9 235 @@ -300,7 +308,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEi04k2+ySkm8kpY0RAv1cAJ9XilPnMbTxBB1WJ8X0to9TztzWHgCfbm1c -VKHaYKmL/7smMTgyrhIqcb4= -=b64+ +iD8DBQFEi3I1OpjtAl+gMRURAslQAKDWOSdr7wCoOM9SD7bLXd2+KhxCewCcCFlC +nSp9EE7/6HavuAx2SHs8aIA= +=aCG3 -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-0.9.15.ebuild b/app-emulation/wine/wine-0.9.15.ebuild index 0046377c3fa6..56e973672f46 100644 --- a/app-emulation/wine/wine-0.9.15.ebuild +++ b/app-emulation/wine/wine-0.9.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.3 2006/06/10 22:52:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.4 2006/06/11 01:30:15 eradicator Exp $ inherit eutils flag-o-matic multilib @@ -60,9 +60,6 @@ DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex" -# this will not build as 64bit code -export ABI=x86 - src_unpack() { unpack wine-${PV}.tar.bz2 cd "${S}" @@ -105,6 +102,18 @@ src_compile() { strip-flags + if use amd64 ; then + # Note, we only need this block if we don't --enable-win64. + # If we do --enable-win64, then ./configure takes care of + # the toolchain for us. + export CHOST="i686-pc-linux-gnu" + export CBUILD="${CHOST}" + + # This should be handled by eselect-binutils in the future: + export LD="$(tc-getLD) -m elf_i386" + export AS="$(tc-getAS) --32" + fi + # $(use_enable amd64 win64) econf \ CC="$(tc-getCC)" \ |