From patchwork Wed Aug 12 20:59:56 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrew Senkevich <andrew.n.senkevich@gmail.com>
X-Patchwork-Id: 8168
Received: (qmail 58555 invoked by alias); 12 Aug 2015 21:00:30 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 58543 invoked by uid 89); 12 Aug 2015 21:00:30 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00,
	FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,
	SPF_PASS autolearn=ham version=3.3.2
X-HELO: mail-la0-f41.google.com
X-Received: by 10.152.10.148 with SMTP id i20mr32945493lab.63.1439413225673;
	Wed, 12 Aug 2015 14:00:25 -0700 (PDT)
MIME-Version: 1.0
From: Andrew Senkevich <andrew.n.senkevich@gmail.com>
Date: Wed, 12 Aug 2015 23:59:56 +0300
Message-ID: 
 <CAMXFM3sH_HnSx01PJUd2FignmAZFV6Y7p=SeheAHKAMkbd9zdw@mail.gmail.com>
Subject: [PATCH][BZ #18796] Fix scripts/test-installation.pl
To: libc-alpha <libc-alpha@sourceware.org>

Hi,

this patch fixes scripts/test-installation.pl fail with --disable-mathvec.

2015-08-12  Andrew Senkevich  <andrew.senkevich@intel.com>

        [BZ #18796]
        * scripts/test-installation.pl: Don't add -lmvec to build options if
        libmvec wasn't built.


Is it ok?
---
WBR,
Andrew

diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index cac1562..79b2b3e 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") {