r1222 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2006-02-23 10:22:36 +0000 (Thu, 23 Feb 2006)
New Revision: 1222
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
Remove previous changes concerning the dynamic linker path on amd64, as they
appear to break the installer. Use that instead:
* Remove the patch to install the libc into /lib instead of /lib64 on
amd64. Use the new libdir, slibdir and rtlddir options in configparm to
install the glibc in (/usr)/lib, and to use the dynamic linker path
specified by the ABI for path for libc objects. (Closes: #325226)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-23 10:15:26 UTC (rev 1221)
+++ glibc-package/trunk/debian/changelog 2006-02-23 10:22:36 UTC (rev 1222)
@@ -49,9 +49,6 @@
[ Aurelien Jarno ]
* Move dependency on lib64gcc1 from libc6-amd64 to libc6-dev-amd64 to
avoid a dependency loop. (Closes: #352263)
- * Remove the patch to install the libc into /lib instead of /lib64 on
- amd64 and move files after the call to 'make install'. This fixes
- the wrong dynamic linker path for libc objects. (Closes: #325226)
* Use sed and test in /etc/init.d/glibc.sh to compare kernel versions.
Put the Debian architecture name in the script at build time instead
of using 'dpkg --print-architecture'. Thanks to Florent Bayle for
@@ -84,8 +81,6 @@
from Randolph Chung. (Closes: #326581)
* Switch to gcc-4.0 on hppa.
* Add support for extra_pkg_install hooks for udeb packages.
- * Add symlinks /lib64 -> /lib and /usr/lib64 -> /usr/lib in libc6-udeb
- on amd64.
* Build back with -g1 on amd64, it was removed to permit the build with
gcc-3.4.
* Remove --with-tls and --with-__thread in sysdeps/* as they are the
@@ -102,7 +97,11 @@
dynamic linker in the ELF binaries) partly from Andreas Jochen. This is
necessary to be able to install a glibc in the multiarch dir while still
conforming to the various ABIs which specify a linker in /lib or /lib64.
-
+ * Remove the patch to install the libc into /lib instead of /lib64 on
+ amd64. Use the new libdir, slibdir and rtlddir options in configparm to
+ install the glibc in (/usr)/lib, and to use the dynamic linker path
+ specified by the ABI for path for libc objects. (Closes: #325226)
+
-- Clint Adams <schizo@debian.org> Sun, 12 Feb 2006 11:04:38 -0500
glibc (2.3.6-1) unstable; urgency=low
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-23 10:15:26 UTC (rev 1221)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-23 10:22:36 UTC (rev 1222)
@@ -2,22 +2,13 @@
libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_add-ons = nptl $(add-ons)
libc_extra_cflags = -O3 -g1
+slibdir = /lib
+libdir = /usr/lib
+rtlddir = /lib64
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
define libc6_extra_pkg_install
ln -sf /lib debian/$(curpass)/lib64
ln -sf lib debian/$(curpass)/usr/lib64
endef
-define libc6-udeb_extra_pkg_install
-ln -sf /lib debian/$(curpass)/lib64
-mkdir -p debian/$(curpass)/usr/lib
-ln -sf lib debian/$(curpass)/usr/lib64
-endef
-define libc_extra_install
-mv debian/tmp-libc/lib64 debian/tmp-libc/lib
-mv debian/tmp-libc/usr/lib64/* debian/tmp-libc/usr/lib
-for link in $$(find debian/tmp-libc/usr/lib -type l) ; do ln -sf $$(readlink $$link | sed -e "s#64##g") $$link ; done
-for so in $$(find debian/tmp-libc/usr/lib -maxdepth 1 -type f -name *.so) ; do perl -pi -e "s#/lib64/#/lib/#g" $$so ; done
-endef
-
Reply to: