Use LD_SO to set $ld_so_name/$ld_so_version

cherry-pick d22e28b070d3d1572d39a463d711c6f223078552

Conflicts:
	ChangeLog
	NEWS

diff --git a/ChangeLog b/ChangeLog
index ac7f88c73c93e59391fcdafc4071338c099f6c25..5e818a9f4ca743b1e26bd44096d0f06bac3554a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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-27  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #14459]

diff --git a/Makefile b/Makefile
index 89588c1e8a6f85721f6d9884c8ada60ce108f6f6..f993c9134732d7dd63fdbd1726d82a9c10b496ac 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 e8c3b1a6d1c3fba1c6ea43cd9d256576042c3376..ecb93507d46eb69582a67a77f2f38fd9719a1472 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16.1
 
 * The following bugs are resolved with this release:
 
-  14195, 14459
+  14195, 14459, 14476
 
 Version 2.16
 

diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index 1b22086bf96e9cbd9f0b65ed5ac9fc6f0ed99e1e..07007708580bd389d1815ee73b5efee17ac5d896 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\.(.*)$/;