new build. this one is built with gcc 3.4.1-r2 using the flags "-march=k8 -m32". it's also trimmed down slightly so that it doesnt bloat future multilib stages. added an env.d script so that this can replace baselibs as a minimal base 32bit environment. glibc version is 2.3.4.20040808

6 files changed, 56 insertions, 26 deletions

diff --git a/app-emulation/emul-linux-x86-glibc/ChangeLog b/app-emulation/emul-linux-x86-glibc/ChangeLog
index 37f04ddab61a..124a81cc16d1 100644
--- a/app-emulation/emul-linux-x86-glibc/ChangeLog
+++ b/app-emulation/emul-linux-x86-glibc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for <CATEGORY>/<PACKAGE_NAME>
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.1 2004/07/31 12:47:02 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.2 2004/08/16 20:40:54 lv Exp $
+
+*emul-linux-x86-glibc-1.1 (16 Aug 2004)
+
+  16 Aug 2004; Travis Tilley <lv@gentoo.org> -emul-linux-x86-glibc-1.0.ebuild,
+  +emul-linux-x86-glibc-1.1.ebuild:
+  new build. this one is built with gcc 3.4.1-r2 using the flags "-march=k8
+  -m32". it's also trimmed down slightly so that it doesnt bloat future multilib
+  stages. added an env.d script so that this can replace baselibs as a minimal
+  base 32bit environment. glibc version is 2.3.4.20040808
 
 *emul-linux-x86-glibc-1.0 (31 Jul 2004)
 
diff --git a/app-emulation/emul-linux-x86-glibc/Manifest b/app-emulation/emul-linux-x86-glibc/Manifest
index 1ef35368a9d1..36977f244deb 100644
--- a/app-emulation/emul-linux-x86-glibc/Manifest
+++ b/app-emulation/emul-linux-x86-glibc/Manifest
@@ -1,4 +1,4 @@
-MD5 02dad00c52c9f1d9e67fab17ec7b0330 emul-linux-x86-glibc-1.0.ebuild 628
-MD5 084c48ba703353af24a12e3d955e7e90 ChangeLog 403
+MD5 a5c43f5a028a57f14c635879158bcd21 emul-linux-x86-glibc-1.1.ebuild 1262
+MD5 b868ed31bfcb0bccfb80111638d02b6f ChangeLog 847
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 18c206a11ce1a6feef068a9f91207e3a files/digest-emul-linux-x86-glibc-1.0 79
+MD5 8dccc3aa6c05f10bd497c77ecae9f0f9 files/digest-emul-linux-x86-glibc-1.1 78
diff --git a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.0.ebuild b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.0.ebuild
deleted file mode 100644
index bc75ca42f150..000000000000
--- a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.0.ebuild,v 1.1 2004/07/31 12:47:02 kugelfang Exp $
-
-DESCRIPTION="GNU C Library for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~kugelfang/emul-linux-x86-glibc-${PV}.tar.bz2
-	mirror://gentoo/distfiles/emul-linux-x86-glibc-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}
-
-src_install() {
-	cp -aRpvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild
new file mode 100644
index 000000000000..1cde27e0b59d
--- /dev/null
+++ b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.1.ebuild,v 1.1 2004/08/16 20:40:54 lv Exp $
+
+DESCRIPTION="GNU C Library for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~kugelfang/emul-linux-x86-glibc-${PV}.tar.bz2
+	mirror://gentoo/distfiles/emul-linux-x86-glibc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+		!<app-emulation/emul-linux-x86-baselibs-1.2"
+
+S=${WORKDIR}
+
+src_install() {
+	# Fixes BUG #49678
+	mkdir -p ${D}/lib
+	ln -sf /emul/linux/x86/lib/ld-linux.so.2 ${D}/lib/ld-linux.so.2
+	ln -sf /emul/linux/x86/lib ${D}/lib32
+
+	# Fixes BUG #51034
+	mkdir -p ${D}/usr
+	ln -sf /emul/linux/x86/usr/lib ${D}/usr/lib32
+
+	cp -aRpvf ${WORKDIR}/* ${D}/
+
+	# fix linker scripts to point to lib32
+	sed -i -e "s/\/lib\//\/lib32\//g" libc.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpthread.so
+
+	# create env.d entry
+	mkdir -p ${D}/etc/env.d
+	cat > ${D}/etc/env.d/40emul-linux-x86-glibc <<ENDOFENV
+LDPATH=/lib32:/usr/lib32:/emul/linux/x86/lib:/emul/linux/x86/usr/lib
+ENDOFENV
+	chmod 644 ${D}/etc/env.d/40emul-linux-x86-glibc
+}
diff --git a/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.0 b/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.0
deleted file mode 100644
index 754ac3635c48..000000000000
--- a/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8094ff10497c35d1c7ca86235d6dfceb emul-linux-x86-glibc-1.0.tar.bz2 10031983
diff --git a/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.1 b/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.1
new file mode 100644
index 000000000000..d89286164a7f
--- /dev/null
+++ b/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.1
@@ -0,0 +1 @@
+MD5 d41b373bb2217799e22adcbb23eb4a33 emul-linux-x86-glibc-1.1.tar.bz2 3315822