gnu: gnu-make-mesboot0: Downgrade to 3.80.

* gnu/packages/commencement.scm (gnu-make-mesboot0): Downgrade to 3.80.

Change-Id: I00b1f6ac934b573bf7845d78e8d4ac78dcd1d0f6

gnu/packages/commencement.scm

@@ -351,8 +351,8 @@ pure Scheme to Tar and decompression in one easy step.")
     (native-inputs `(("bootar" ,bootar)))))
 
 (define (%boot-gash-inputs)
-  `(("bash" , gash-boot)               ;gnu-build-system used to expect "bash"
-    ("coreutils" , gash-utils-boot)
+  `(("bash" ,gash-boot)                 ;gnu-build-system used to expect "bash"
+    ("coreutils" ,gash-utils-boot)
     ("bootar" ,bootar)
     ("guile" ,%bootstrap-guile)))
 
@@ -432,7 +432,7 @@ MesCC-Tools), and finally M2-Planet.")
   (package
     (inherit mes)
     (name "mes-boot")
-    (version "0.27")
+    (version "0.27.1")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "mirror://gnu/mes/"
@@ -441,7 +441,7 @@ MesCC-Tools), and finally M2-Planet.")
                                         "mes-" version ".tar.gz")))
               (sha256
                (base32
-                "1a5ag8i303yhf76sg05rpcans9vadvnpxcpa4sl09z4cv5bfcgh3"))))
+                "0pgjzlynfzdfq5xrxirvsrj4sdvnwq99s6xxwfhzhjga8zm40fhq"))))
     (inputs '())
     (propagated-inputs '())
     (supported-systems '("i686-linux" "x86_64-linux"
@@ -681,13 +681,13 @@ MesCC-Tools), and finally M2-Planet.")
   (package
     (inherit gnu-make)
     (name "make-mesboot0")
-    (version "3.82")
+    (version "3.80")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/make/make-" version ".tar.gz"))
               (sha256
                (base32
-                "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x"))))
+                "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4"))))
     (inputs '())
     (propagated-inputs '())
     (native-inputs `(("tcc" ,tcc-boot0)
@@ -930,7 +930,9 @@ MesCC-Tools), and finally M2-Planet.")
            "CC=tcc"
            "AR=tcc -ar"
            "RANLIB=true"
-           "CFLAGS=-DSYSCALL_NO_TLS -D__riscv_float_abi_soft -U__riscv_flen")
+           #$@(if (target-riscv64?)
+                  #~("CFLAGS=-DSYSCALL_NO_TLS -D__riscv_float_abi_soft -U__riscv_flen")
+                  #~("CFLAGS=-DSYSCALL_NO_TLS")))
        #:configure-flags
        #~(let ((bash #$(this-package-native-input "bash")))
            (list "CC=tcc"
@@ -1010,9 +1012,10 @@ MesCC-Tools), and finally M2-Planet.")
                              ;; Instead of checking if the header already exists
                              ;; install them in a 'backwards' order, so the
                              ;; preferred one never ends up overridden.
-                             (find-files "obj/include/bits")
-                             (find-files "arch/generic/bits")
-                             (find-files (string-append "arch/" arch "/bits"))))
+                             (find-files "obj/include/bits" "\\.h$")
+                             (find-files "arch/generic/bits" "\\.h$")
+                             (find-files
+                               (string-append "arch/" arch "/bits") "\\.h$")))
                  (when (file-exists? (string-append lib "/libc.so"))
                    (symlink "libc.so"
                             (string-append lib "/ld-musl-" arch ".so.1")))))))))))
@@ -1120,10 +1123,20 @@ MesCC-Tools), and finally M2-Planet.")
 (define oksh-muslboot0
   (package
     (inherit oksh)
-    (source (bootstrap-origin (package-source oksh)))
+    (version "7.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/ibara/oksh/releases/download/oksh-"
+             version "/oksh-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0l59x9mm6nbixcpz3zf3iplqili2gyw8l382rj89b0iv32hxac1v"))))
     (arguments
      (list
        #:implicit-inputs? #f
+       #:license-file-regexp "LEGAL"
        #:guile %bootstrap-guile
        #:tests? #f                  ; No tests.
        #:strip-binaries? #f         ; No strip yet.
@@ -1162,9 +1175,15 @@ MesCC-Tools), and finally M2-Planet.")
     (inputs '())
     (propagated-inputs '())
     (native-inputs
-     (modify-inputs (package-native-inputs tcc-musl)
-                    (replace "tcc" tcc-musl)
-                    (replace "bash" oksh-muslboot0)))
+     ;; It seems we need ranlib on some architectures.
+     (if (target-x86?)
+         (modify-inputs (package-native-inputs tcc-musl)
+                        (replace "tcc" tcc-musl)
+                        (replace "bash" oksh-muslboot0)
+                        (prepend binutils-mesboot0))
+         (modify-inputs (package-native-inputs tcc-musl)
+                        (replace "tcc" tcc-musl)
+                        (replace "bash" oksh-muslboot0))))
     (arguments
      (list #:implicit-inputs? #f
            #:guile %bootstrap-guile
@@ -1195,9 +1214,11 @@ MesCC-Tools), and finally M2-Planet.")
                "CFLAGS=-g"
                "CC=tcc"
                "LD=tcc"
-               "AR=tcc -ar"
+               #$@(if (target-x86?)
+                      #~("AR=ar")
+                      #~("AR=tcc -ar"
+                         "RANLIB=true"))
                "MAKEINFO=true"
-               "RANLIB=true"
                "--enable-64-bit-bfd"
                "--disable-nls"
                "--disable-shared"
@@ -1627,9 +1648,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (uri (string-append "mirror://gnu/m4/m4-" version ".tar.gz"))
               (sha256
                (base32 "1arz972zxmwhnyik9007g6ww9gars8d55xbvg548xlsw3a9369mb"))))
-    (native-inputs (if (target-x86?)
+    (native-inputs #;(if (target-x86?)
                        (%boot-mesboot1-inputs)
-                       (%boot-tcc-musl-inputs)))
+                       (%boot-tcc-musl-inputs))
+                       (%boot-tcc-musl-inputs))
     (inputs '())
     (propagated-inputs '())
     (arguments
@@ -1637,11 +1659,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
        #:tests? #f
        #:guile %bootstrap-guile
        #:implicit-inputs? #f
-       #:parallel-build? (target-x86?)
+       #:parallel-build? #f#;(target-x86?)
        #:configure-flags
-       #~(list #$@(if (target-x86?)
-                      #~()
-                      #~("CC=tcc"))
+       #~(list ;#$@(if (target-x86?)
+               ;       #~()
+               ;       #~("CC=tcc"))
+               "CC=tcc"
                (string-append "--build=" #$(commencement-build-target))
                (string-append "--host=" #$(commencement-build-target)))))))
 
@@ -1656,9 +1679,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (uri (string-append "mirror://gnu/gmp/gmp-" version ".tar.gz"))
               (sha256
                (base32 "09w5yzlvdll19fa9zhh0f4y97hv8483cbly0003zvbvyighpzwvi"))))
-    (native-inputs (if (target-x86?)
+    (native-inputs #;(if (target-x86?)
                        (%boot-mesboot1-inputs)
-                       (%boot-tcc-musl-inputs)))
+                       (%boot-tcc-musl-inputs))
+                       (%boot-tcc-musl-inputs))
     (inputs (list m4-boot))
     (propagated-inputs '())
     (arguments
@@ -1668,9 +1692,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
        #:implicit-inputs? #f
        #:parallel-build? #f
        #:configure-flags
-       #~(list #$@(if (target-x86?)
-                      #~()
-                      #~("CC=tcc"))
+       #~(list ;#$@(if (target-x86?)
+               ;       #~()
+               ;       #~("CC=tcc"))
+               "CC=tcc"
+               "CFLAGS=-D HAVE_ALLOCA_H"
                (string-append "--build=" #$(commencement-build-target))
                (string-append "--host=" #$(commencement-build-target))
                "--enable-static"
@@ -1690,9 +1716,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.gz"))
               (sha256
                (base32 "1mm2zxjqxxqlacd87cxlyi63pwrxwafqks7lmpqa3wqq6a0zw9ri"))))
-    (native-inputs (if (target-x86?)
+    (native-inputs #;(if (target-x86?)
                        (%boot-mesboot1-inputs)
-                       (%boot-tcc-musl-inputs)))
+                       (%boot-tcc-musl-inputs))
+                       (%boot-tcc-musl-inputs))
     (inputs '())
     (propagated-inputs (list gmp-boot))
     (arguments
@@ -1700,11 +1727,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
        #:guile %bootstrap-guile
        #:tests? #f
        #:implicit-inputs? #f
-       #:parallel-build? (target-x86?)
+       #:parallel-build? #f#;(target-x86?)
        #:configure-flags
-       #~(list #$@(if (target-x86?)
-                      #~()
-                      #~("CC=tcc"))
+       #~(list ;#$@(if (target-x86?)
+               ;       #~()
+               ;       #~("CC=tcc"))
+               "CC=tcc"
                (string-append "--build=" #$(commencement-build-target))
                (string-append "--host=" #$(commencement-build-target))
                "--enable-static"
@@ -1721,9 +1749,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
               (uri (string-append "mirror://gnu/mpc/mpc-" version ".tar.gz"))
               (sha256
                (base32 "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"))))
-    (native-inputs (if (target-x86?)
+    (native-inputs #;(if (target-x86?)
                        (%boot-mesboot1-inputs)
-                       (%boot-tcc-musl-inputs)))
+                       (%boot-tcc-musl-inputs))
+                       (%boot-tcc-musl-inputs))
     (inputs '())
     (propagated-inputs (list gmp-boot mpfr-boot))
     (arguments
@@ -1731,11 +1760,12 @@ ac_cv_c_float_format='IEEE (little-endian)'
        #:guile %bootstrap-guile
        #:tests? #f
        #:implicit-inputs? #f
-       #:parallel-build? (target-x86?)
+       #:parallel-build? #f#;(target-x86?)
        #:configure-flags
-       #~(list #$@(if (target-x86?)
-                      #~()
-                      #~("CC=tcc"))
+       #~(list ;#$@(if (target-x86?)
+               ;       #~()
+               ;       #~("CC=tcc"))
+               "CC=tcc"
                (string-append "--build=" #$(commencement-build-target))
                (string-append "--host=" #$(commencement-build-target))
                "--enable-static"
@@ -1819,7 +1849,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
 (define gcc-muslboot0
   (package
-    (inherit gcc-4.7)
+    (inherit gcc-base)
     (name "gcc-muslboot0")
     (version "4.6.4")
     (source (origin
@@ -1842,11 +1872,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
            #:parallel-build? #f             ; for debugging
            #:configure-flags
            #~(let ((out  (assoc-ref %outputs "out"))
-                   (libc (assoc-ref %build-inputs "libc"))
-                   (bash (assoc-ref %build-inputs "bash")))
+                   (libc (assoc-ref %build-inputs "libc")))
                (list (string-append "--prefix=" out)
                      (string-append "--with-build-sysroot=" libc "/include")
-                     (string-append "--with-native-system-header-dir=" libc "/include")
+                     ;(string-append "--with-native-system-header-dir=" libc "/include")
                      (string-append "--build="
                                     #$(string-replace-substring
                                         (commencement-build-target)
@@ -1895,6 +1924,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                    (let ((libc (assoc-ref inputs "libc")))
                      ;; Fix the dynamic linker's file name.
                      ;; This should work on gcc-13 for all architectures except loongarch.
+                     #;
                      (substitute* (find-files "gcc/config"
                                               "^(aarch64-)?(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
                        (("(#define MUSL_DYNAMIC_LINKER*).*$" _ dynamic-linker)
@@ -1908,7 +1938,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                          _ gnu-user suffix)
                         (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
                                 gnu-user suffix
-                                (string-append libc "/lib/libc.so")))))))
+                                (string-append libc "/lib/libc.a")))))))
                (add-after 'apply-riscv64-patch 'patch-for-modern-libc
                  (lambda _
                    (for-each
@@ -1920,6 +1950,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                (add-before 'configure 'setenv
                  (lambda _
                    (setenv "CC" "tcc")
+                   (setenv "CPP" "tcc -E")  ; probably
                    (setenv "CFLAGS" "-D HAVE_ALLOCA_H")
                    ;; We don't have an existing C++ compiler so we need to set
                    ;; the search path manually.
@@ -2119,9 +2150,10 @@ ac_cv_c_float_format='IEEE (little-endian)'
     (supported-systems '("i686-linux" "x86_64-linux" "riscv64-linux"))
     (inputs '())
     (propagated-inputs '())
-    (native-inputs (if (target-x86?)
+    (native-inputs #;(if (target-x86?)
                        (%boot-mesboot2-inputs)
-                       (%boot-muslboot2-inputs)))
+                       (%boot-muslboot2-inputs))
+                       (%boot-muslboot2-inputs))
     (arguments
      `(#:implicit-inputs? #f
        #:guile ,%bootstrap-guile
@@ -3159,7 +3191,16 @@ exec " gcc "/bin/" program
   (package
     (inherit findutils)
     (name "findutils-boot0")
-    (source (bootstrap-origin (package-source findutils)))
+    (version "4.9.0")
+    (source
+     (bootstrap-origin (origin
+                        (method url-fetch)
+                        (uri (string-append "mirror://gnu/findutils/findutils-"
+                                            version ".tar.xz"))
+                        (sha256
+                         (base32
+                          "1zk2sighc26bfdsm97bv7cd1cnvq7r4gll4zqpnp0rs3kp0bigx2"))
+                        (patches (search-patches "findutils-localstatedir.patch")))))
     (inputs
      `(("make" ,gnu-make-boot0)
        ("diffutils" ,diffutils-boot0) ; for tests
@@ -3167,50 +3208,49 @@ exec " gcc "/bin/" program
     (arguments
      `(#:implicit-inputs? #f
        #:guile ,%bootstrap-guile
-       ;; The build system assumes we have done a mistake when time_t is 32-bit
+       ;; The build system assumes we have made a mistake when time_t is 32-bit
        ;; on a 64-bit system.  Ignore that for our bootstrap toolchain.
-       ,@(substitute-keyword-arguments (package-arguments findutils)
-           ((#:configure-flags flags ''())
-            `(append
-               ;; TODO: Figure out exactly with architectures need this.
-              ,(if (target-64bit?)
-                   ''("TIME_T_32_BIT_OK=yes")
-                   ''())
-              '("--disable-year2038")
-              '()       ; XXX: List only added to prevent rebuilds!
-              ,flags))
-           ((#:phases phases '%standard-phases)
-            `(modify-phases ,phases
-               (add-before 'check 'skip-problematic-tests
-                 (lambda _
-                   ,(match (%current-system)
-                     ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due
-                     ;; to incorrect handling of the [:alpha:] regexp character
-                     ;; class.  Ignore it.
-                     ((or "x86_64-linux" "i686-linux")
-                      '(substitute* "gnulib-tests/Makefile"
-                         (("^XFAIL_TESTS =")
-                          "XFAIL_TESTS = test-fnmatch ")))
-                     ("armhf-linux"
-                      '(substitute* "gnulib-tests/Makefile"
-                         (("^XFAIL_TESTS =")
-                          "XFAIL_TESTS = test-fnmatch ")
-                         (("test-pthread-thread\\$\\(EXEEXT\\)") "")))
-                     ("riscv64-linux"
-                      '(substitute* "gnulib-tests/Makefile"
-                         ;; These tests fails non-deterministically.
-                         (("test-hard-locale\\$\\(EXEEXT\\)") "")
-                         (("test-sigprocmask\\$\\(EXEEXT\\)") "")
-                         (("test-setlocale_null-mt-all\\$\\(EXEEXT\\)") "")
-                         (("test-pthread_sigmask1\\$\\(EXEEXT\\)") "")))
-                     (_
-                      ;; XXX: The pthread tests are known to fail at least on
-                      ;; ARM; skip them.
-                      '(substitute* "gnulib-tests/Makefile"
-                         (("test-pthread\\$\\(EXEEXT\\)") "")
-                         (("test-pthread-thread\\$\\(EXEEXT\\)") "")
-                         (("test-pthread_sigmask1\\$\\(EXEEXT\\)") "")
-                         (("test-pthread_sigmask2\\$\\(EXEEXT\\)") "")))))))))))))
+       #:configure-flags
+       (list ,@(if (target-x86-64?)
+                   '("TIME_T_32_BIT_OK=yes")
+                   '())
+             ;; XXX: 32-bit Hurd platforms don't support 64bit time_t
+             ,@(if (target-hurd32?)
+                   '("--disable-year2038")
+                   '())
+             ;; Tell 'updatedb' to write to /var.
+             "--localstatedir=/var")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'adjust-test-shebangs
+           (lambda _
+             (substitute* '("tests/xargs/verbose-quote.sh"
+                            "tests/find/exec-plus-last-file.sh")
+               (("#!/bin/sh")
+                (string-append "#!" (which "sh"))))))
+         (add-before 'check 'skip-problematic-tests
+           (lambda _
+             ,(match (%current-system)
+               ;; 'test-fnmatch' fails when using a glibc version earlier
+               ;; than 2.25 (or so), due to incorrect handling of the
+               ;; [:alpha:] regexp character class.  Ignore it.
+               ((or "x86_64-linux" "i686-linux" "armhf-linux")
+                '(substitute* "gnulib-tests/Makefile"
+                   (("^XFAIL_TESTS =")
+                    "XFAIL_TESTS = test-fnmatch ")))
+               ("riscv64-linux"
+                '(substitute* "gnulib-tests/Makefile"
+                   ;; These tests fails non-deterministically.
+                   (("test-hard-locale\\$\\(EXEEXT\\)") "")
+                   (("test-sigprocmask\\$\\(EXEEXT\\)") "")
+                   (("test-setlocale_null-mt-all\\$\\(EXEEXT\\)") "")
+                   (("test-pthread_sigmask1\\$\\(EXEEXT\\)") "")))
+               ((or "i586-gnu" "x86_64-gnu")
+                '(substitute* "gnulib-tests/test-strerror_r.c"
+                   ;; This test fails non-deterministically.
+                   (("(^| )main *\\(.*" all)
+                    (string-append all "{\n  exit (77);//"))))
+               (_ #t)))))))))
 
 (define file
   (package
@@ -3912,14 +3952,48 @@ exec " gcc "/bin/" program
   (package
     (inherit m4)
     (name "m4-boot0")
-    (source (bootstrap-origin (package-source m4)))
+    (version "1.4.20")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/m4/m4-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0axgilr6n88br7msm3ls8m4zlwgk4q3vcjqw1cknqpyg3hxfldp2"))))
     (inputs (%boot0-inputs))
     (arguments
      `(#:guile ,%bootstrap-guile
        #:implicit-inputs? #f
-       ,@(package-arguments m4)
-       ;; Ignore test failure in gnulib for armhf/aarch64 and Hurd
-       #:tests? ,(and (not (target-arm?))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-test
+           (lambda _
+             ;; Test 5 raises SIGINT from a child and immediately returns
+             ;; code 71, and tests whether the child was killed by a signal.
+             ;; Since there is no signal handler for SIGINT in the build
+             ;; container, the parent sees the return code, and fails.
+             ;; XXX: For some reason adding signal handlers in Guile before
+             ;; running tests has no effect.
+             (substitute* "tests/test-execute.sh"
+               (("4 5 6")
+                "4 6"))))
+         ,@(if (target-hurd64?)
+               '((add-after 'unpack 'patch-sigsegv
+                   (lambda _
+                     ;; Stack overflow recovery does not compile
+                     (substitute* "lib/sigsegv.in.h"
+                       (("__GNU__") "__XGNU__")))))
+               '())
+         (add-after 'unpack 'configure-shell
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
+             (let ((/bin/sh (search-input-file (or native-inputs inputs)
+                                               "/bin/sh")))
+               ;; Adjust hard-coded /bin/sh for tests.
+               (substitute* "lib/config.hin"
+                 (("\"/bin/sh\"")
+                  (format #f "\"~a\"" /bin/sh)))))))
+       ;; Ignore test failure in gnulib for riscv64 and Hurd
+       #:tests? ,(and (not (target-riscv64?))
                       (not (target-hurd?)))))))
 
 (define bison-boot0