diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-04-10 23:07:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-10 23:07:01 +0000 |
| commit | f1dfdc8c6309508294d170b6ac451cb8c153e0e2 (patch) | |
| tree | 36d79c2a09783ff2008eee3badc43b57581e2fdc /app-emulation/wine | |
| parent | Version bump #129240 by Duncan. (diff) | |
| download | gentoo-2-f1dfdc8c6309508294d170b6ac451cb8c153e0e2.tar.gz gentoo-2-f1dfdc8c6309508294d170b6ac451cb8c153e0e2.tar.bz2 gentoo-2-f1dfdc8c6309508294d170b6ac451cb8c153e0e2.zip | |
fix building on amd64
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/wine-0.9.11.ebuild | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/app-emulation/wine/wine-0.9.11.ebuild b/app-emulation/wine/wine-0.9.11.ebuild index a682bc8fcabb..24be12070bfe 100644 --- a/app-emulation/wine/wine-0.9.11.ebuild +++ b/app-emulation/wine/wine-0.9.11.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.11.ebuild,v 1.3 2006/04/09 17:49:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.4 2006/04/10 23:07:01 vapier Exp $ inherit eutils flag-o-matic multilib @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="-* -amd64 ~x86" +KEYWORDS="-* ~amd64 ~x86" IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X" RESTRICT="test" #72375 @@ -59,9 +59,8 @@ DEPEND="${RDEPEND} sys-devel/bison sys-devel/flex" -pkg_setup() { - use amd64 && has_multilib_profile && export ABI=x86 -} +# this will not build as 64bit code +export ABI=x86 src_unpack() { unpack wine-${PV}.tar.bz2 @@ -71,6 +70,14 @@ src_unpack() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + + # disable X include / lib searching as we setup our toolchain + # to properly locate the files ... otherwise, it'll use the host + # `xmkmf` binary which reports 'lib64' on amd64. boo! + sed -i \ + -e '/^x_includes=/s:=NONE:=:' \ + -e '/^x_libraries=/s:=NONE:=:' \ + configure || die } config_cache() { |