commit: 5a3dc0fafc5e84a7c4dbfe8c2885a2a43bf0c384
parent 1899f7f02b28c7dd13a6940698041d8ded990abe
Author: Samuel Tyler <fosslinux@aussies.space>
Date: Fri, 28 Feb 2025 13:10:05 +1100
Merge pull request #515 from stikonas/mes_norebuild
Do not rebuild mes, just keep using mes-m2.
Diffstat:
5 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/parts.rst b/parts.rst
@@ -209,8 +209,7 @@ to this part:
1. Compiling an initial mes using ``M2-Planet``. Note that this is
*only* the Mes interpreter, not the libc or anything else.
-2. We then use this to recompile the Mes interpreter as well as building
- the libc. This second interpreter is faster and less buggy.
+2. We then use this to build the libc.
The ``mescc`` component depends on the ``nyacc`` parsing library, version 1.00.2.
We use a modified version, 1.00.2-lb1, which incorporates Timothy Sample's
diff --git a/steps/mes-0.27/mes-0.27.amd64.checksums b/steps/mes-0.27/mes-0.27.amd64.checksums
@@ -1,4 +1,3 @@
-7594d17004baa35b368411240be675b5c8e59fcd556a0c0d560721fe2091f8be /usr/bin/mes
6ec83e7fd106448610ffe348d1847e501656e1c667f4afbc0099eb8a431726b6 /usr/bin/mes-m2
20655e4ec935bdb63099eaf48e89b24010413a444cbcdc3f21a1cd12a5c62ddc /usr/bin/mescc.scm
c66de1ba72b8019eee113271638e4e30543aa7d34f45c9cc751346dba0d8817c /usr/lib/x86_64-mes/crt1.s
diff --git a/steps/mes-0.27/mes-0.27.x86.checksums b/steps/mes-0.27/mes-0.27.x86.checksums
@@ -1,4 +1,3 @@
-8925c10128b3414062f670795c6eece8760a067d821aff95c26ed2b80c2cd8c0 /usr/bin/mes
c7fe23d83f630bcc5f613e7d779cffa30b0cf282c1a49049195e5a44de027a78 /usr/bin/mes-m2
761fe4fbbee5bfd45506ea8dbd0aeecfe8855159bd794e07fca1988109510170 /usr/bin/mescc.scm
234c264965116a24583dd569050adc766d7cc2da83b1db38085210f26031b70c /usr/lib/x86-mes/crt1.s
diff --git a/steps/mes-0.27/pass1.kaem b/steps/mes-0.27/pass1.kaem
@@ -213,33 +213,7 @@ mescc lib/linux/getdents.c
catm ${LIBDIR}/${MES_ARCH}-mes/libc.a __init_io.o eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o isnumber.o abtol.o cast.o eputc.o fdgetc.o fdputc.o fdputs.o fdungetc.o itoa.o ltoa.o ltoab.o mes_open.o ntoab.o oputc.o ultoa.o utoa.o isdigit.o isspace.o isxdigit.o assert_msg.o write.o atoi.o lseek.o __assert_fail.o __buffered_read.o __mes_debug.o execv.o getcwd.o getenv.o isatty.o open.o buffered-read.o setenv.o wait.o closedir.o opendir.o fgetc.o fputc.o fputs.o getc.o getchar.o putc.o putchar.o ungetc.o calloc.o free.o malloc.o realloc.o memchr.o memcmp.o memcpy.o memmove.o memset.o strcmp.o strcpy.o strncmp.o raise.o access.o brk.o chdir.o chmod.o clock_gettime.o dup.o dup2.o execve.o fork.o fsync.o _getcwd.o gettimeofday.o ioctl3.o _open3.o _read.o readdir.o rename.o time.o umask.o uname.o unlink.o utimensat.o wait4.o waitpid.o syscall.o getpid.o kill.o pipe.o stat.o lstat.o mkdir.o rmdir.o link.o symlink.o close.o nanosleep.o fcntl.o fstat.o getdents.o
catm ${LIBDIR}/${MES_ARCH}-mes/libc.s __init_io.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s isnumber.s abtol.s cast.s eputc.s fdgetc.s fdputc.s fdputs.s fdungetc.s itoa.s ltoa.s ltoab.s mes_open.s ntoab.s oputc.s ultoa.s utoa.s isdigit.s isspace.s isxdigit.s assert_msg.s write.s atoi.s lseek.s __assert_fail.s __buffered_read.s __mes_debug.s execv.s getcwd.s getenv.s isatty.s open.s buffered-read.s setenv.s wait.s closedir.s opendir.s fgetc.s fputc.s fputs.s getc.s getchar.s putc.s putchar.s ungetc.s calloc.s free.s malloc.s realloc.s memchr.s memcmp.s memcpy.s memmove.s memset.s strcmp.s strcpy.s strncmp.s raise.s access.s brk.s chdir.s chmod.s clock_gettime.s dup.s dup2.s execve.s fork.s fsync.s _getcwd.s gettimeofday.s ioctl3.s _open3.s _read.s readdir.s rename.s time.s umask.s uname.s unlink.s utimensat.s wait4.s waitpid.s syscall.s getpid.s kill.s pipe.s stat.s lstat.s mkdir.s rmdir.s link.s symlink.s close.s nanosleep.s fcntl.s fstat.s getdents.s
-# Build mes itself
-mescc src/builtins.c
-mescc src/cc.c
-mescc src/core.c
-mescc src/display.c
-mescc src/eval-apply.c
-mescc src/gc.c
-mescc src/globals.c
-mescc src/hash.c
-mescc src/lib.c
-mescc src/math.c
-mescc src/mes.c
-mescc src/module.c
-mescc src/posix.c
-mescc src/reader.c
-mescc src/stack.c
-mescc src/string.c
-mescc src/struct.c
-mescc src/symbol.c
-mescc src/variable.c
-mescc src/vector.c
-
-# Link everything into new mes executable
-${MES} -e main ${mescc_scm} -- --base-address 0x08048000 -L ${LIBDIR} -o ${BINDIR}/mes builtins.o cc.o core.o display.o eval-apply.o gc.o globals.o hash.o lib.o math.o mes.o module.o posix.o reader.o stack.o string.o struct.o symbol.o variable.o vector.o -lc -lmescc
-
# libc+tcc.a
-alias mescc="${BINDIR}/mes -e main ${BINDIR}/mescc.scm -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -c"
mescc lib/ctype/islower.c
mescc lib/ctype/isupper.c
mescc lib/ctype/tolower.c
@@ -391,7 +365,6 @@ cd ../..
# Checksums
if match x${UPDATE_CHECKSUMS} xTrue; then
sha256sum -o ${pkg}.${ARCH}.checksums \
- /usr/bin/mes \
/usr/bin/mes-m2 \
/usr/bin/mescc.scm \
/usr/lib/${MES_ARCH}-mes/crt1.s \
diff --git a/steps/tcc-0.9.26/pass1.kaem b/steps/tcc-0.9.26/pass1.kaem
@@ -12,7 +12,7 @@ MES_ARENA=30000000
MES_MAX_ARENA=30000000
MES_LIB=${MES_PREFIX}/lib
MES_SOURCE=${MES_PREFIX}
-MES=${BINDIR}/mes
+MES=${BINDIR}/mes-m2
TCC_TAR=tcc-0.9.26
TCC_PKG=tcc-0.9.26-1147-gee75a10c
