1 diff -rupN glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/64/configure glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/configure
2 --- glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/64/configure 2014-09-07 22:22:21.455309835 +0200
3 +++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/configure 2014-09-07 22:39:12.718456952 +0200
4 @@ -4,10 +4,10 @@
5 test -n "$libc_cv_slibdir" ||
6 case "$prefix" in
7 /usr | /usr/)
8 - libc_cv_slibdir=/lib64
9 - libc_cv_rtlddir=/lib64
10 + libc_cv_slibdir=/lib
11 + libc_cv_rtlddir=/lib
12 if test "$libdir" = '${exec_prefix}/lib'; then
13 - libdir='${exec_prefix}/lib64';
14 + libdir='${exec_prefix}/lib';
15 # Locale data can be shared between 32-bit and 64-bit libraries.
16 libc_cv_localedir='${exec_prefix}/lib/locale'
17 fi
18 diff -rupN glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h glibc-2.20/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
19 --- glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2014-09-07 22:22:21.456309870 +0200
20 +++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2014-09-07 22:38:43.949456973 +0200
21 @@ -18,9 +18,9 @@
22 #include <sysdeps/generic/ldconfig.h>
23
24 #define SYSDEP_KNOWN_INTERPRETER_NAMES \
25 - { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
26 + { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
27 { "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \
28 - { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
29 + { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
30 #define SYSDEP_KNOWN_LIBRARY_NAMES \
31 { "libc.so.6", FLAG_ELF_LIBC6 }, \
32 { "libm.so.6", FLAG_ELF_LIBC6 },
33 diff -rupN glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed glibc-2.20/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
34 --- glibc-2.20-orig/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2014-09-07 22:22:21.456309870 +0200
35 +++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2014-09-07 22:38:43.949456973 +0200
36 @@ -1,3 +1,3 @@
37 /LD_TRACE_LOADED_OBJECTS=1/a\
38 add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
39 -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_
40 +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
|
