r1241 - in glibc-package/trunk/debian: . rules.d sysdeps
Author: aurel32
Date: 2006-02-26 15:05:29 +0000 (Sun, 26 Feb 2006)
New Revision: 1241
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
* Install the 32-bit libraries in /emul/ia32-linux(/usr)/lib on amd64.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-26 15:02:49 UTC (rev 1240)
+++ glibc-package/trunk/debian/changelog 2006-02-26 15:05:29 UTC (rev 1241)
@@ -7,6 +7,7 @@
* Use the new slibdir, libdir, rtlddir variables to build the various
flavours of the libc. Put them directly in the final directory, and
remove the corresponding tweaks done after the make install phase.
+ * Install the 32-bit libraries in /emul/ia32-linux(/usr)/lib on amd64.
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-26 15:02:49 UTC (rev 1240)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-26 15:05:29 UTC (rev 1241)
@@ -198,7 +198,7 @@
shift; \
z=debian/$(libc)-$$x.install; \
case $$slibdir in \
- /lib32 | /lib64) \
+ /lib32 | /lib64 | /emul/ia32-linux) \
libdir=$$1; \
shift; \
cp debian/debhelper.in/libc-alt.install $$z; \
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-26 15:02:49 UTC (rev 1240)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-26 15:05:29 UTC (rev 1241)
@@ -23,9 +23,8 @@
i386_extra_cflags = -march=pentium4 -g1 -O3
i386_extra_config_options = $(extra_config_options) --includedir=/usr/include/i486-linux-gnu
i386_rtlddir = /lib
-i386_slibdir = /lib/i486-linux-gnu
-i386_libdir = /usr/lib/i486-linux-gnu
-i386_LIBDIR = /i486-linux-gnu
+i386_slibdir = /emul/ia32-linux/lib
+i386_libdir = /emul/ia32-linux/usr/lib
i386_MIN_KERNEL_SUPPORTED = 2.6.0
define libc6-dev-i386_extra_pkg_install
@@ -36,5 +35,5 @@
define libc6-i386_extra_pkg_install
mkdir -p debian/libc6-i386/lib
-ln -sf /lib/i486-linux-gnu/ld-linux.so.2 debian/libc6-i386/lib
+ln -sf /emul/ia32-linux/lib/ld-2.3.2.so debian/libc6-i386/lib
endef
Reply to: