Revert "gnu: m4-boot0: Downgrade to 1.4.18."

This reverts commit 9cdb5e7f8fa0bcfc311db4b1274666ddfe271d46.

This version FTBFS on powerpc64le-linux.

1 files changed, 2 insertions, 25 deletions

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 526ffd5b909..da3f44ab7bb 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3412,35 +3412,12 @@ exec " gcc "/bin/" program
   (package
     (inherit m4)
     (name "m4-boot0")
-    (version "1.4.18")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/m4/m4-" version ".tar.gz"))
-              (sha256
-               (base32 "1arz972zxmwhnyik9007g6ww9gars8d55xbvg548xlsw3a9369mb"))))
+    (source (bootstrap-origin (package-source m4)))
     (inputs (%boot0-inputs))
     (arguments
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'pre-check
-           (lambda* (#:key inputs #:allow-other-keys)
-             (for-each patch-shebang (find-files "tests" "\\.sh$"))
-             (substitute* (find-files "tests" "posix_spawn")
-               (("/bin/sh")
-                (search-input-file inputs "/bin/sh")))))
-         ;; Better to skip some tests instead of all the tests.
-         ,@(if (target-riscv64?)
-               `((add-after 'unpack 'skip-some-tests
-                   (lambda _
-                     (substitute* "tests/Makefile.in"
-                       (("test-canonicalize-lgpl\\$\\(EXEEXT\\) ") "")
-                       (("test-localename\\$\\(EXEEXT\\) ") "")
-                       (("test-mbrtowc5.sh ") "")
-                       (("test-sigprocmask\\$\\(EXEEXT\\) ") "")
-                       ))))
-               `()))
+       ,@(package-arguments m4)
        ;; Ignore test failure in gnulib for armhf/aarch64 and Hurd
        #:tests? ,(and (not (target-arm?))
                       (not (target-hurd?)))))))