This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: [BZ #14476]: test-installation.pl fails on x86_64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Tue, 28 Aug 2012 12:39:36 -0700
- Subject: PATCH: [BZ #14476]: test-installation.pl fails on x86_64
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
scripts/test-installation.pl reads soversions.mk. But it doesn't
understand
ld.so-version=$(if $(abi-64-ld-soname),$(abi-64-ld-soname),ld.so.1)
This patch passes LD_SO=$(ld.so-version) to scripts/test-installation.pl
and uses it to set $ld_so_name and $ld_so_version. OK to install?
Thanks.
H.J.
--
2012-08-28 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.
diff --git a/Makefile b/Makefile
index b0d3edb..50c3eed 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/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\.(.*)$/;