01/15: gnu: findutils: Fix bootstrap on aarch64-linux and armhf-linux.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit f87b68a18627fe8bab960d45460dd2217fa85def
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Jan 14 17:56:24 2020 +0100

    gnu: findutils: Fix bootstrap on aarch64-linux and armhf-linux.
    
    * gnu/packages/patches/findutils-test-rwlock-threads.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/base.scm (findutils)[source](patches): Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/base.scm                              |  3 +-
 .../patches/findutils-test-rwlock-threads.patch    | 38 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index fd3d434..0ba01ef 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -854,6 +854,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/fifo-map-remove-catch.hpp.patch         \
   %D%/packages/patches/file-CVE-2019-18218.patch               \
   %D%/packages/patches/findutils-localstatedir.patch           \
+  %D%/packages/patches/findutils-test-rwlock-threads.patch     \
   %D%/packages/patches/flann-cmake-3.11.patch                  \
   %D%/packages/patches/flint-ldconfig.patch                    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch    \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a336f5e..52ca78f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -261,7 +261,8 @@ interactive means to merge two files.")
             (sha256
              (base32
               "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"))
-            (patches (search-patches "findutils-localstatedir.patch"))))
+            (patches (search-patches "findutils-localstatedir.patch"
+                                     "findutils-test-rwlock-threads.patch"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags (list
diff --git a/gnu/packages/patches/findutils-test-rwlock-threads.patch 
b/gnu/packages/patches/findutils-test-rwlock-threads.patch
new file mode 100644
index 0000000..3062577
--- /dev/null
+++ b/gnu/packages/patches/findutils-test-rwlock-threads.patch
@@ -0,0 +1,38 @@
+Skip "test-rwlock1" when multithreading is disabled, which is the case
+during bootstrapping on architectures not supported by GNU Mes.
+
+Taken from upstream gnulib:
+https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=fdff8bd09a7f053381f8bdb107ab5280b7c95959
+
+diff --git a/gnulib-tests/test-rwlock1.c b/gnulib-tests/test-rwlock1.c
+--- a/gnulib-tests/test-rwlock1.c
++++ b/gnulib-tests/test-rwlock1.c
+@@ -21,6 +21,8 @@
+ 
+ #include <config.h>
+ 
++#if USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || 
USE_WINDOWS_THREADS
++
+ #include "glthread/lock.h"
+ 
+ #include <errno.h>
+@@ -151,3 +153,18 @@ main ()
+       sleep (1);
+     }
+ }
++
++#else
++
++/* No multithreading available.  */
++
++#include <stdio.h>
++
++int
++main ()
++{
++  fputs ("Skipping test: multithreading not enabled\n", stderr);
++  return 77;
++}
++
++#endif
+