diff options
| author | Andrew Senkevich <andrew.senkevich@intel.com> | 2015-08-19 19:02:32 +0300 |
|---|---|---|
| committer | Andrew Senkevich <andrew.senkevich@intel.com> | 2015-08-19 19:02:32 +0300 |
| commit | 9031106ea063f0476bdabf3f5ec22758cdcf987b (patch) | |
| tree | 3593b7d5e16b86662ad3b1fd4d389f47841457ac | |
| parent | a34d1c6afc86521d6ad17662a3b5362d8481514c (diff) | |
| download | glibc-9031106ea063f0476bdabf3f5ec22758cdcf987b.tar.gz glibc-9031106ea063f0476bdabf3f5ec22758cdcf987b.tar.xz glibc-9031106ea063f0476bdabf3f5ec22758cdcf987b.zip | |
[BZ #18796]
* scripts/test-installation.pl: Don't add -lmvec to build options
if libmvec wasn't built.
* NEWS: Mention this fix.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | scripts/test-installation.pl | 13 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ee071b9ee4..c2bdf59b51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. + * NEWS: Mention this fix. + 2015-08-10 Maxim Ostapenko <m.ostapenko@partner.samsung.com> [BZ #18778] diff --git a/NEWS b/NEWS index d89d8e9f64..a8f85aa3a9 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Version 2.22.1 * The following bugs are resolved with this release: - 18778, 18781, 18787. + 18778, 18781, 18787, 18796. Version 2.22 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") { |