Use LD_SO to set $ld_so_name/$ld_so_version

diff --git a/ChangeLog b/ChangeLog
index 2490456..bd896ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [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-29  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
        [BZ #14516]

diff --git a/Makefile b/Makefile
index b0d3edb..50c3eed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ install:
 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

diff --git a/NEWS b/NEWS
index 6abc6ea..b2800e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Version 2.17
   3479, 5400, 6778, 6808, 9685, 11607, 13717, 13696, 13939, 14042, 14090,
   14166, 14150, 14151, 14154, 14157, 14166, 14173, 14195, 14252, 14283,
   14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459,
-  14505, 14516, 14519
+  14476, 14505, 14516, 14519
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index 1b22086..0700770 100755 (executable)
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -25,6 +25,11 @@ if ($ENV{CC}) {
 } else {
   $CC= "gcc";
 }
+if ($ENV{LD_SO}) {
+  $LD_SO = $ENV{LD_SO};
+} else {
+  $LD_SO = "";
+}
 
 sub usage {
   print "Usage: test-installation [soversions.mk]\n";
@@ -112,6 +117,8 @@ while (<SOVERSIONS>) {
       $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\.(.*)$/;