diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2004-04-15 00:13:18 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2004-04-15 00:13:18 +0000 |
| commit | 9df1fe8e4e32b963d0251aa15bc70db71eed6e15 (patch) | |
| tree | c13ac42838c84d7b98f461f658949c8c4dd234a5 /app-emulation | |
| parent | Added ~sparc keyword. (Manifest recommit) (diff) | |
| download | gentoo-2-9df1fe8e4e32b963d0251aa15bc70db71eed6e15.tar.gz gentoo-2-9df1fe8e4e32b963d0251aa15bc70db71eed6e15.tar.bz2 gentoo-2-9df1fe8e4e32b963d0251aa15bc70db71eed6e15.zip | |
Additional fix for BUG #47773
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/ChangeLog | 3 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog index ebcff4c249da..193e56acde1d 100644 --- a/app-emulation/emul-linux-x86-xlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog @@ -1,10 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-xlibs # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.6 2004/04/14 11:47:28 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.7 2004/04/15 00:13:17 kugelfang Exp $ 14 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild: Ebuild now adds /etc/env.d/75emul-linux-x86-xlibs "on the fly", I forgot to include that into the tarball. Fixes BUG #47773. + Also fixed libxrx.so[.6] to be symlinks and not copies of libxrx.so.6.3. (Also BUG #47773) 14 Apr 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild: it seems xlibs 1.1 is broken for some people, so i'm going to mask it for now diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild index 6b42482b5ebd..18b18e9b14d9 100644 --- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild +++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild,v 1.3 2004/04/14 11:47:28 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild,v 1.4 2004/04/15 00:13:18 kugelfang Exp $ DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64" SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-xlibs-1.1.tar.bz2" @@ -28,9 +28,18 @@ src_install() { mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/drivers mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/input mkdir -p ${D}/etc/env.d + # ARGH, forgot to include env.d file, workaround till next version echo "LDPATH=/emul/linux/x86/usr/X11R6/lib:/emul/linux/x86/usr/lib/opengl/xorg-x11/lib" > ${D}/etc/env.d/75emul-linux-x86-xlibs #mv -v ${WORKDIR}/etc/env.d/75emul-linux-x86-xlibs ${D}/etc/env.d/ #rm -Rf ${WORKDIR}/etc + + # ARGH2, libxrx.so[.6] must be symlinks ! + cd ${WORKDIR}/usr/X11R6/lib + rm -f libxrx.so + rm -f libxrx.so.6 + ln -sf libxrx.so.6.3 libxrx.so + ln -sf libxrx.so.6.3 libxrx.so.6 + cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86 } |