aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Senkevich <andrew.senkevich@intel.com>2015-08-19 16:54:28 +0300
committerAndrew Senkevich <andrew.senkevich@intel.com>2015-08-19 16:54:28 +0300
commita08e80d1143f6b0386d5bc8cc7b8ed576091dbf3 (patch)
treeff575833bc249921c62eb5a8b7d90b5a24c7ede4
parent9b9d20faf6185f5dcb36cde48ca3c9db866086ee (diff)
downloadglibc-a08e80d1143f6b0386d5bc8cc7b8ed576091dbf3.tar
glibc-a08e80d1143f6b0386d5bc8cc7b8ed576091dbf3.tar.gz
glibc-a08e80d1143f6b0386d5bc8cc7b8ed576091dbf3.tar.bz2
glibc-a08e80d1143f6b0386d5bc8cc7b8ed576091dbf3.zip
[BZ #18796]
* scripts/test-installation.pl: Don't add -lmvec to build options if libmvec wasn't built.
-rw-r--r--ChangeLog6
-rwxr-xr-xscripts/test-installation.pl13
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4218f2cadd..da4f3c75bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-19 Andrew Senkevich <andrew.senkevich@intel.com>
+
+ [BZ #18796]
+ * scripts/test-installation.pl: Don't add -lmvec to build options if
+ libmvec wasn't built.
+
2015-08-19 Petar Jovanovic <petar.jovanovic@rt-rk.com>
[BZ #14341]
diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index cac15624dc..79b2b3edab 100755
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -80,16 +80,25 @@ arglist: while (@ARGV) {
# We expect none or one argument.
if ($#ARGV == -1) {
$soversions="soversions.mk";
+ $config="config.make";
} elsif ($#ARGV == 0) {
if (-d $ARGV[0]) {
$soversions = "$ARGV[0]/soversions.mk";
+ $config = "$ARGV[0]/config.make";
} else {
- $soversions = $ARGV[0];
+ $soversions = $dir = $ARGV[0];
+ $dir =~ s!/?[^/]*/*$!!;
+ $config = $dir . "/config.make";
}
} else {
die "Wrong number of arguments.";
}
+if (system ("grep -q \"build-mathvec = yes\" $config") == 0) {
+ $build_mathvec = 1;
+} else {
+ $build_mathvec = 0;
+}
# Read names and versions of all shared libraries that are part of
# glibc
@@ -111,6 +120,8 @@ while (<SOVERSIONS>) {
# - libthread_db since it contains unresolved references
# - it's just a test NSS module
# - We don't provide the libgcc so we don't test it
+ # - libmvec if it wasn't built
+ next if ($build_mathvec == 0 && $name eq "mvec");
if ($name ne "nss_ldap" && $name ne "db1"
&& !($name =~/^nss1_/) && $name ne "thread_db"
&& $name ne "nss_test1" && $name ne "libgcc_s") {