This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.16/master updated. glibc-2.16.0-11-g5b48980
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Aug 2012 15:34:29 -0000
- Subject: GNU C Library master sources branch release/2.16/master updated. glibc-2.16.0-11-g5b48980
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, release/2.16/master has been updated
via 5b489807f7c8902901b42451883f3d5c89616a8a (commit)
from da1f431963218999c49cae928309dfec426c575c (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=5b489807f7c8902901b42451883f3d5c89616a8a
commit 5b489807f7c8902901b42451883f3d5c89616a8a
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Aug 29 06:45:37 2012 -0700
Use LD_SO to set $ld_so_name/$ld_so_version
cherry-pick d22e28b070d3d1572d39a463d711c6f223078552
Conflicts:
ChangeLog
NEWS
diff --git a/ChangeLog b/ChangeLog
index ac7f88c..5e818a9 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 89588c1..f993c91 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 e8c3b1a..ecb9350 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 1b22086..0700770 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\.(.*)$/;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
Makefile | 2 +-
NEWS | 2 +-
scripts/test-installation.pl | 7 +++++++
4 files changed, 17 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources