44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
diff -rupN glibc-2.18.orig/sysdeps/gnu/configure glibc-2.18/sysdeps/gnu/configure
|
|
--- glibc-2.18.orig/sysdeps/gnu/configure 2013-08-13 09:25:25.678263957 +0200
|
|
+++ glibc-2.18/sysdeps/gnu/configure 2013-08-13 09:34:04.270306644 +0200
|
|
@@ -14,14 +14,14 @@ case "$prefix" in
|
|
test -n "$libc_cv_slibdir" || \
|
|
case $machine in
|
|
sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64)
|
|
- libc_cv_slibdir=/lib64
|
|
+ libc_cv_slibdir=/lib
|
|
case $machine in
|
|
s390/s390-64)
|
|
libc_cv_rtlddir=/lib
|
|
;;
|
|
esac
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
- libdir='${exec_prefix}/lib64';
|
|
+ libdir='${exec_prefix}/lib';
|
|
# Locale data can be shared between 32bit and 64bit libraries
|
|
libc_cv_localedir='${exec_prefix}/lib/locale'
|
|
fi
|
|
diff -rupN glibc-2.18.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h glibc-2.18/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
|
|
--- glibc-2.18.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2013-08-13 09:25:25.611261622 +0200
|
|
+++ glibc-2.18/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2013-08-13 09:27:16.032107337 +0200
|
|
@@ -18,9 +18,9 @@
|
|
#include <sysdeps/generic/ldconfig.h>
|
|
|
|
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
|
|
- { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
|
|
+ { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
|
|
{ "/libx32/ld-linux-x32.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 },
|
|
diff -rupN glibc-2.18.orig/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed glibc-2.18/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
|
|
--- glibc-2.18.orig/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2013-08-13 09:25:25.611261622 +0200
|
|
+++ glibc-2.18/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2013-08-13 09:32:04.476137395 +0200
|
|
@@ -1,3 +1,3 @@
|
|
/LD_TRACE_LOADED_OBJECTS=1/a\
|
|
add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
|
|
-s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
|
|
+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
|