Bug#277972: glibc: Please change the remaining instances of 'lib64' to 'lib' on amd64
Package: glibc
Severity: wishlist
Tags: patch
The attached patch changes the remaining two instances of 'lib64' to 'lib'
on amd64 by patching the files 'sysdeps/unix/sysv/linux/x86_64/ldconfig.h'
and 'sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed'.
The two patches are appended to the 'debian/patches/amd64-lib.dpatch' file
which already contains the change of the libdir directory from 'lib64' to
'lib' on amd64.
Regards
Andreas Jochens
diff -urN ../tmp-orig/glibc-2.3.2.ds1/debian/patches/amd64-lib.dpatch ./debian/patches/amd64-lib.dpatch
--- ../tmp-orig/glibc-2.3.2.ds1/debian/patches/amd64-lib.dpatch 2004-10-23 19:31:41.841744664 +0000
+++ ./debian/patches/amd64-lib.dpatch 2004-10-20 12:56:58.000000000 +0000
@@ -6,7 +6,7 @@
# DP: Patch author:
# DP: Upstream status: Debian-Specific
# DP: Status Details:
-# DP: Date: 2004-06-07
+# DP: Date: 2004-10-20
if [ $# -ne 2 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
@@ -44,3 +44,22 @@
mips/mips64/n64/* )
libc_cv_slibdir="/lib64"
if test "$libdir" = '${exec_prefix}/lib'; then
+--- ldconfig.h 2002-04-22 11:51:40.000000000 +0000
++++ glibc-2.3.2/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2004-10-07 14:47:52.649686928 +0000
+@@ -20,7 +20,7 @@
+
+ #define SYSDEP_KNOWN_INTERPRETER_NAMES \
+ { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
+- { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
++ { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
+ #define SYSDEP_KNOWN_LIBRARY_NAMES \
+ { "libc.so.6", FLAG_ELF_LIBC6 }, \
+ { "libm.so.6", FLAG_ELF_LIBC6 },
+
+--- ldd-rewrite.sed 2002-04-09 08:39:14.000000000 +0000
++++ glibc-2.3.2/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2004-10-20 12:56:17.929716960 +0000
+@@ -1,3 +1,3 @@
+ /LD_TRACE_LOADED_OBJECTS=1/a\
+ add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
+-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4\5\6"_
++s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\)\(-x86-64\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4\5\6"_
Reply to: