diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-08-29 06:45:37 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-08-29 08:20:27 -0700 |
commit | 5b489807f7c8902901b42451883f3d5c89616a8a (patch) | |
tree | 4b7c20ee5c2c7eb6e7afcdbd61d501b873b5fb06 | |
parent | da1f431963218999c49cae928309dfec426c575c (diff) | |
download | glibc-5b489807f7c8902901b42451883f3d5c89616a8a.tar.gz glibc-5b489807f7c8902901b42451883f3d5c89616a8a.tar.xz glibc-5b489807f7c8902901b42451883f3d5c89616a8a.zip |
Use LD_SO to set $ld_so_name/$ld_so_version
cherry-pick d22e28b070d3d1572d39a463d711c6f223078552 Conflicts: ChangeLog NEWS
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | scripts/test-installation.pl | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ac7f88c73c..5e818a9f4c 100644 --- 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 89588c1e8a..f993c91347 100644 --- 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 e8c3b1a6d1..ecb93507d4 100644 --- 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 1b22086bf9..0700770858 100755 --- 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\.(.*)$/; |