This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-288-g0f31fe7

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  0f31fe77917284db6537bf9fdf45f3f656025ff9 (commit)
      from  633f745dcad9c7324f56f8ef85ee9b460b1006e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0f31fe77917284db6537bf9fdf45f3f656025ff9

commit 0f31fe77917284db6537bf9fdf45f3f656025ff9
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Sun Sep 11 20:33:24 2011 +0200

    Prepend $(..) to $(ldd-rewrite-script) if non-absolute

diff --git a/ChangeLog b/ChangeLog
index 7f9208f..e9c2747 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>
 
 	[BZ #13067]
diff --git a/elf/Makefile b/elf/Makefile
index bb46601..a2d976e 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 816289a..a8ebcf2 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 8f00407..3f1daab 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
     ;;
   *)
     ;;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |    8 ++++++++
 elf/Makefile                         |    3 ++-
 sysdeps/unix/sysv/linux/configure    |   12 ++++++------
 sysdeps/unix/sysv/linux/configure.in |   12 ++++++------
 4 files changed, 22 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]