diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 15:02:32 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 15:02:32 -0400 |
| commit | 773523e08dfce391058e6521a8485e9ccc0c3573 (patch) | |
| tree | dbe28a95e74be4aa15faa8182e67a4d039265d06 | |
| parent | 83cd14204559abbb52635006832eaf4d2f42514a (diff) | |
| parent | 0f31fe77917284db6537bf9fdf45f3f656025ff9 (diff) | |
| download | glibc-773523e08dfce391058e6521a8485e9ccc0c3573.tar.gz glibc-773523e08dfce391058e6521a8485e9ccc0c3573.tar.xz glibc-773523e08dfce391058e6521a8485e9ccc0c3573.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 12 |
4 files changed, 22 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 275e693d3f..f0328d327e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-09-11 Andreas Schwab <schwab@linux-m68k.org> + + * elf/Makefile (gen-ldd): Prepend $(..) to $(ldd-rewrite-script) + if non-absolute. + * sysdeps/unix/sysv/linux/configure.in: Remove leading ../ from + ldd_rewrite_script. + * sysdeps/unix/sysv/linux/configure: Regenerated. + 2011-09-11 Ulrich Drepper <drepper@gmail.com> * configure.in: Remove --with-tls option. diff --git a/elf/Makefile b/elf/Makefile index bb46601a3a..a2d976ebc5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -482,7 +482,8 @@ LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< > $@.new endef else define gen-ldd -LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< | LC_ALL=C sed -f $(ldd-rewrite-script) > $@.new +LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \ +| LC_ALL=C sed -f $(patsubst $(..)/,/,$(..)$(ldd-rewrite-script)) > $@.new endef endif diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 816289a797..a8ebcf251a 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -485,22 +485,22 @@ use_ldconfig=yes case "$machine" in i[3456]86* | m68*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed ;; ia64*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ;; s390*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed ;; sparc*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed ;; x86_64*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed ;; powerpc*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed ;; *) ;; diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 8f00407a8b..3f1daab4ef 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -224,22 +224,22 @@ use_ldconfig=yes changequote(,) case "$machine" in i[3456]86* | m68*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed ;; ia64*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ;; s390*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed ;; sparc*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed ;; x86_64*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed ;; powerpc*) - ldd_rewrite_script=../sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed + ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed ;; *) ;; |