~ruther/guix-local: gnu: automake-1.17: Fix cross-build.

868161a287711f3429c59047569afc778aea2bcc — Janneke Nieuwenhuizen 1 year, 1 month ago 832f613

gnu: automake-1.17: Fix cross-build.

* gnu/packages/autotools.scm (automake)[arguments]: Skip two tests that
attempt to run [cross-]built executables, when cross-building.

Change-Id: I24bd012352400583fd8aad67c6d1f344954f973c

patch browse .tar.gz .zip

1 files changed, 10 insertions(+), 1 deletions(-)

M gnu/packages/autotools.scm

M gnu/packages/autotools.scm => gnu/packages/autotools.scm +10 -1

@@ 462,7 462,16 @@ Makefile, simplifying the entire process for the developer.")
                       ;; make: Nothing to be done for 'all'.
                       "t/remake-aclocal-version-mismatch.sh")
                   (("^#!.*" all)
-                   (string-append all "exit 77;\n")))))))))))
+                   (string-append all "exit 77;\n")))))
+            #$@(if (%current-target-system)
+                   #~((add-before 'check 'cross-skip-tests
+                        (lambda _
+                          ;; These tests try to execute a cross-built program
+                          (substitute* '("t/dist-vs-built-sources.sh"
+                                         "t/subobj-objname-clash.sh")
+                            (("^#!.*" all)
+                             (string-append all "exit 77;\n"))))))
+                   #~())))))))
 
 (define-public libtool
   (package