commit: 3e7b17c03e81af111a665b64863c6da788a2c09d
parent fb522be854975d14de5d111559d7161dcaee2470
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Thu, 4 Feb 2021 21:29:33 +0000
Update m4 from 1.4 to 1.4.4.
Diffstat:
7 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ Bash ships with a bison pre-generated file here which we delete. Unfortunately,
we have not bootstrapped bison but fortunately for us, heirloom yacc is able to
cope here.
-#### Part 21: m4 1.4
+#### Part 21: m4 1.4.4
`m4` is the first piece of software we need in the autotools suite and flex 2.6.4.
It allows macros to be defined and files to be generated from those macros.
diff --git a/rootfs.sh b/rootfs.sh
@@ -130,8 +130,8 @@ get_file http://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070
# bash 2.05b
get_file https://ftp.gnu.org/pub/gnu/bash/bash-2.05b.tar.gz
-# m4 1.4
-get_file https://ftp.gnu.org/gnu/m4/m4-1.4.tar.gz
+# m4 1.4.4
+get_file https://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz
# flex 2.5.11
get_file http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.11.tar.gz
diff --git a/sysa/grep-2.4/mk/main.mk b/sysa/grep-2.4/mk/main.mk
@@ -8,7 +8,9 @@ AR = tcc -ar
CFLAGS = -DPACKAGE=\"$(PACKAGE)\" \
-DVERSION=\"$(VERSION)\" \
-DHAVE_DIRENT_H=1 \
- -DHAVE_UNISTD_H=1
+ -DHAVE_UNISTD_H=1 \
+ -DHAVE_STRERROR=1 \
+ -DREGEX_MALLOC=1
.PHONY: all
diff --git a/sysa/m4-1.4.4/mk/main.mk b/sysa/m4-1.4.4/mk/main.mk
@@ -0,0 +1,33 @@
+PRODUCT = m4
+VERSION = 1.4
+
+CC = tcc
+LD = tcc
+AR = tcc -ar
+
+CFLAGS = -I lib \
+ -DPRODUCT=\"$(PRODUCT)\" \
+ -DVERSION=\"$(VERSION)\" \
+ -DHAVE_SIGNAL_H=1 \
+ -DPACKAGE_STRING=\"GNU\ M4\ 1.4.4\"
+
+LDFLAGS = -L . -lm4
+
+.PHONY: all
+
+LIB_SRC = regex getopt getopt1 error obstack xmalloc xstrdup
+LIB_OBJECTS = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC)))
+
+M4_SRC = m4 builtin debug eval format freeze input macro output path symtab
+M4_OBJ = $(addprefix src/, $(addsuffix .o, $(M4_SRC)))
+
+all: m4
+
+m4: libm4.a $(M4_OBJ)
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
+libm4.a: $(LIB_OBJECTS)
+ $(AR) cr $@ $^
+
+install: all
+ install m4 $(PREFIX)/bin
diff --git a/sysa/m4-1.4/mk/main.mk b/sysa/m4-1.4/mk/main.mk
@@ -1,31 +0,0 @@
-PRODUCT = m4
-VERSION = 1.4
-
-CC = tcc
-LD = tcc
-AR = tcc -ar
-
-CFLAGS = -I lib \
- -DPRODUCT=\"$(PRODUCT)\" \
- -DVERSION=\"$(VERSION)\"
-
-LDFLAGS = -L . -lm4
-
-.PHONY: all
-
-LIB_SRC = regex getopt getopt1 error obstack xmalloc xstrdup
-LIB_OBJECTS = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC)))
-
-M4_SRC = m4 builtin debug eval format freeze input macro output path symtab
-M4_OBJ = $(addprefix src/, $(addsuffix .o, $(M4_SRC)))
-
-all: m4
-
-m4: libm4.a $(M4_OBJ)
- $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
-
-libm4.a: $(LIB_OBJECTS)
- $(AR) cr $@ $^
-
-install: all
- install m4 $(PREFIX)/bin
diff --git a/sysa/m4-1.4/patches/signal-include.patch b/sysa/m4-1.4/patches/signal-include.patch
@@ -1,15 +0,0 @@
-sys/signal.h is not the POSIX appropriate place for signal.h, which mes libc
-attempts to conform to.
-
-diff -r -U3 src/m4.c src/m4.c
---- src/m4.c 1994-11-02 03:14:28.000000000 +0000
-+++ src/m4.c 2021-01-15 00:19:21.947654461 +0000
-@@ -19,7 +19,7 @@
- #include "m4.h"
-
- #include <getopt.h>
--#include <sys/signal.h>
-+#include <signal.h>
-
- static void usage _((int));
-
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -10,7 +10,7 @@ set -e
export PREFIX=/after
# Part 21
-build m4-1.4
+build m4-1.4.4
# Part 22
build flex-2.5.11
