01/01: gnu: coreutils: Fix cross-compilation.

[Manolis Fragkiskos Ragkousis]

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

commit 82a7a8c6671cb50a7886983af0c2d58d1cf62bc9
Author: Manolis Ragkousis <address@hidden>
Date:   Wed Jan 18 20:48:27 2017 +0200

    gnu: coreutils: Fix cross-compilation.
    
    * gnu/packages/patches/coreutils-fix-cross-compilation.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/base.scm (coreutils)[source]: Use it.
---
 gnu/local.mk                                            |    1 +
 gnu/packages/base.scm                                   |    3 ++-
 .../patches/coreutils-fix-cross-compilation.patch       |   15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1904856..8c91574 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -510,6 +510,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/clx-remove-demo.patch                   \
   %D%/packages/patches/cmake-fix-tests.patch                   \
   %D%/packages/patches/coda-use-system-libs.patch              \
+  %D%/packages/patches/coreutils-fix-cross-compilation.patch    \
   %D%/packages/patches/cpio-CVE-2016-2037.patch                        \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
   %D%/packages/patches/cracklib-CVE-2016-6318.patch            \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f6946f3..703274d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -291,7 +291,8 @@ used to apply commands with arbitrarily long arguments.")
                                 version ".tar.xz"))
             (sha256
              (base32
-              "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"))))
+              "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm"))
+            (patches (search-patches 
"coreutils-fix-cross-compilation.patch"))))
    (build-system gnu-build-system)
    (inputs `(("acl"  ,acl)                        ; TODO: add SELinux
              ("gmp"  ,gmp)                        ;bignums in 'expr', yay!
diff --git a/gnu/packages/patches/coreutils-fix-cross-compilation.patch 
b/gnu/packages/patches/coreutils-fix-cross-compilation.patch
new file mode 100644
index 0000000..3f0d35c
--- /dev/null
+++ b/gnu/packages/patches/coreutils-fix-cross-compilation.patch
@@ -0,0 +1,15 @@
+Coreutils fails to cross compile for other platforms because cu_install_program
+is not being evaluated properly. This patch fixes it.
+See <https://lists.gnu.org/archive/html/coreutils/2017-01/msg00039.html>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -5023,7 +5023,7 @@ pr = progs-readme
+ @address@hidden = src/ginstall
+ 
+ # Use the just-built 'ginstall', when not cross-compiling.
address@hidden@cu_install_program = @INSTALL_PROGRAM@
address@hidden@cu_install_program := @INSTALL@
+ info_TEXINFOS = doc/coreutils.texi
+ doc_coreutils_TEXINFOS = \
+   doc/perm.texi \
+