From cd93a0748184db3d5734667ded458eec334abab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 6 Nov 2021 00:07:13 +0000
Subject: [PATCH] Update mes-m2 and stage0-posix.

---
 SHA256SUMS.sources    | 2 +-
 sysa.py               | 2 +-
 sysa/mes/checksums    | 2 +-
 sysa/mes/mes.kaem     | 2 +-
 sysa/run.kaem         | 2 +-
 sysa/stage0-posix/src | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 2198d09..64eb109 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -77,7 +77,7 @@ eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7  libunistring-0
 3d991b33e604187c5881a0abc2e102d5b9776da5569640e73778f85d617242e7  make-3.82.tar.gz
 e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7  make-4.2.1.tar.gz
 7a140e43565181bb54bf416117ea0efff057922ed284db5fc98b3740a7f3d956  mes-0.23.tar.gz
-59de3d0d09cedfd6889b8b3c35de9d15e0ce815f1ecb5bd8dcce1397e68ed32e  mes.tar.gz
+1d56965b6b0cca046c2d0127775de81de82dbcf26ce6aa1e8b1bae7c3c0304d8  mes.tar.gz
 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459  mpc-1.2.1.tar.gz
 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f  mpfr-4.1.0.tar.xz
 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
diff --git a/sysa.py b/sysa.py
index 945fe13..1c27094 100755
--- a/sysa.py
+++ b/sysa.py
@@ -108,7 +108,7 @@ class SysA(SysGeneral):
         """Prepare remaining sources"""
 
         # mes-0.22 snapshot with m2 fixes
-        self.get_file(["https://github.com/oriansj/mes-m2/archive/7fa2f99bf9bba2d79bd9d15c579be8905520d960.tar.gz",
+        self.get_file(["https://github.com/oriansj/mes-m2/archive/c07111ff876882591bc0077b32b7303d3bf2b99e.tar.gz",
                        "https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz"],
                       output=["mes.tar.gz", "nyacc-1.00.2.tar.gz"])
 
diff --git a/sysa/mes/checksums b/sysa/mes/checksums
index b684e4a..0abc5e4 100644
--- a/sysa/mes/checksums
+++ b/sysa/mes/checksums
@@ -1,4 +1,4 @@
-ce118f1e43fb36f394466707183ee29f8dde5e0296632cdc739883dad35bfed7  /usr/bin/mes-m2
+61595f43c1b8e1e952c7c24a08df9fb5e429f5f65eb6f9f0c3a03f854bc247de  /usr/bin/mes-m2
 2337a7eb4431ad2e9161e82d0ff918e0821f56ee27469d8d18d3d7dbbcc99dc3  /usr/bin/mescc.scm
 90811dafd33ad56b8e4b0adcc04263f9329b9047b7cc337abe8151a75017172c  /usr/lib/x86-mes/crt1.s
 e065af5f73d40b20029e9ba23143660f99c6abacb82d1b4c8f2067a4e395d553  /usr/lib/x86-mes/crt1.o
diff --git a/sysa/mes/mes.kaem b/sysa/mes/mes.kaem
index 64565a5..55eb17c 100755
--- a/sysa/mes/mes.kaem
+++ b/sysa/mes/mes.kaem
@@ -34,7 +34,7 @@ cp mes/module/srfi/srfi-9/gnu-struct.mes mes/module/srfi/srfi-9/gnu.mes
 
 # Build mes-m2
 mkdir bin m2
-kaem -v -f kaem.run
+kaem --verbose --strict --file kaem.${ARCH}
 cp bin/mes-m2 ${bindir}/mes-m2
 chmod 755 ${bindir}/mes-m2
 
diff --git a/sysa/run.kaem b/sysa/run.kaem
index 59aaaa7..2ea1000 100755
--- a/sysa/run.kaem
+++ b/sysa/run.kaem
@@ -21,7 +21,7 @@ tmpdir=/tmp # tmpdir is needed for patch to work
 # Environmental variables needed for mes
 NYACC_PKG=nyacc-1.00.2
 MES_PKG=mes
-MES_PREFIX=${sources}/${MES_PKG}/src/mes-m2-7fa2f99bf9bba2d79bd9d15c579be8905520d960
+MES_PREFIX=${sources}/${MES_PKG}/src/mes-m2-c07111ff876882591bc0077b32b7303d3bf2b99e
 GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sources}/${MES_PKG}/src/${NYACC_PKG}/module
 mkdir ${prefix} ${bindir} ${libdir} ${incdir} ${tmpdir}
 cd ${prefix}
diff --git a/sysa/stage0-posix/src b/sysa/stage0-posix/src
index 7def254..4d2a020 160000
--- a/sysa/stage0-posix/src
+++ b/sysa/stage0-posix/src
@@ -1 +1 @@
-Subproject commit 7def2545b2f7f6613942cccd10876cce15492889
+Subproject commit 4d2a020c7a1706fbaa9858a45b73ef45ff1f3058