[PATCH] gnu: coreutils: Fix cross-compilation.

[PATCH] gnu: coreutils: Fix cross-compilation.

[manolis837]

From: Manolis Ragkousis <manolis837@gmail.com>

* gnu/packages/patches/coreutils-fix-cross-compilation.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/base.scm [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(-)
 create mode 100644 gnu/packages/patches/coreutils-fix-cross-compilation.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 532ea51dd..82bf89cf7 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 f6946f3c9..703274d0c 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 000000000..3f0d35c33
--- /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
+ @CROSS_COMPILING_FALSE@cu_install_program = src/ginstall
+ 
+ # Use the just-built 'ginstall', when not cross-compiling.
+-@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@
++@CROSS_COMPILING_TRUE@cu_install_program := @INSTALL@
+ info_TEXINFOS = doc/coreutils.texi
+ doc_coreutils_TEXINFOS = \
+   doc/perm.texi \
+
-- 
2.11.0

Re: [PATCH] gnu: coreutils: Fix cross-compilation.

[Ludovic Courtès]

Hi Manolis!

manolis837@gmail.com skribis:

> From: Manolis Ragkousis <manolis837@gmail.com>
>
> * gnu/packages/patches/coreutils-fix-cross-compilation.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/base.scm [source]: Use it.

[...]

> --- /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
> + @CROSS_COMPILING_FALSE@cu_install_program = src/ginstall
> + 
> + # Use the just-built 'ginstall', when not cross-compiling.
> +-@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@
> ++@CROSS_COMPILING_TRUE@cu_install_program := @INSTALL@
> + info_TEXINFOS = doc/coreutils.texi

LGTM!  Even if upstream settles on a different approach, this patch is
fine for our purposes.

Thanks for investigating!

Ludo’.