[Commits] r20413 - in /fsf/glibc-2_16-branch/libc: ChangeLog Makefile NEWS scripts/test-installation.pl

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Aug 30 00:02:31 2012
New Revision: 20413

Log:
Import glibc-2.16 for 2012-08-30

Modified:
    fsf/glibc-2_16-branch/libc/ChangeLog
    fsf/glibc-2_16-branch/libc/Makefile
    fsf/glibc-2_16-branch/libc/NEWS
    fsf/glibc-2_16-branch/libc/scripts/test-installation.pl

Modified: fsf/glibc-2_16-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_16-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_16-branch/libc/ChangeLog Thu Aug 30 00:02:31 2012
@@ -1,3 +1,11 @@
+2012-08-29  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14476]
+	* Makefile (install): Also pass LD_SO=$(ld.so-version) to
+	scripts/test-installation.pl.
+	* scripts/test-installation.pl: Use LD_SO to get $ld_so_name
+	and $ld_so_version if it is set.
+
 2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #14459]

Modified: fsf/glibc-2_16-branch/libc/Makefile
==============================================================================
--- fsf/glibc-2_16-branch/libc/Makefile (original)
+++ fsf/glibc-2_16-branch/libc/Makefile Thu Aug 30 00:02:31 2012
@@ -111,7 +111,7 @@
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-	CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+	LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif

Modified: fsf/glibc-2_16-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_16-branch/libc/NEWS (original)
+++ fsf/glibc-2_16-branch/libc/NEWS Thu Aug 30 00:02:31 2012
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  14195, 14459
+  14195, 14459, 14476
 
 Version 2.16
 

Modified: fsf/glibc-2_16-branch/libc/scripts/test-installation.pl
==============================================================================
--- fsf/glibc-2_16-branch/libc/scripts/test-installation.pl (original)
+++ fsf/glibc-2_16-branch/libc/scripts/test-installation.pl Thu Aug 30 00:02:31 2012
@@ -24,6 +24,11 @@
   $CC = $ENV{CC};
 } else {
   $CC= "gcc";
+}
+if ($ENV{LD_SO}) {
+  $LD_SO = $ENV{LD_SO};
+} else {
+  $LD_SO = "";
 }
 
 sub usage {
@@ -112,6 +117,8 @@
       $link_libs .= " -l$name";
       $versions{$name} = $version;
     }
+  } elsif ($LD_SO ne "") {
+    ($ld_so_name, $ld_so_version) = split ('\.so\.', $LD_SO);
   } else {
     if (/^ld\.so/) {
       ($ld_so_name, $ld_so_version)= /=(.*)\.so\.(.*)$/;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits