[lfs-patches] r3267 - trunk/glibc

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Sun Aug 23 12:18:47 PDT 2015


Author: bdubbs
Date: Sun Aug 23 12:18:47 2015
New Revision: 3267

Log:
Add glibc i386 patch

Added:
   trunk/glibc/glibc-2.22-upstream_i386_fix-1.patch

Added: trunk/glibc/glibc-2.22-upstream_i386_fix-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/glibc/glibc-2.22-upstream_i386_fix-1.patch	Sun Aug 23 12:18:47 2015	(r3267)
@@ -0,0 +1,55 @@
+Submitted By:            Bruce Dubbs <bdubbs at linuxfromscratch dot org>
+Date:                    2015-08-23
+Initial Package Version: 2.22
+Upstream Status:         In repository
+Origin:                  https://github.molgen.mpg.de/git-mirror/glibc
+Description:             This patch fixes a build problem on 32-bit systems.
+
+commit a08e80d1143f6b0386d5bc8cc7b8ed576091dbf3
+Author: Andrew Senkevich <andrew.senkevich at intel.com>
+Date:   Wed Aug 19 16:54:28 2015 +0300
+
+        [BZ #18796]
+        * scripts/test-installation.pl: Don't add -lmvec to build options if
+        libmvec wasn't built.
+
+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") {


More information about the patches mailing list