diff --git a/README.md b/README.md index 21d8173..85bea90 100644 --- 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 index e39d40c..3546ffe 100755 --- 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 index c35d91b..09de660 100644 --- 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/mk/main.mk b/sysa/m4-1.4.4/mk/main.mk similarity index 83% rename from sysa/m4-1.4/mk/main.mk rename to sysa/m4-1.4.4/mk/main.mk index a47d196..72c4176 100644 --- a/sysa/m4-1.4/mk/main.mk +++ b/sysa/m4-1.4.4/mk/main.mk @@ -7,7 +7,9 @@ AR = tcc -ar CFLAGS = -I lib \ -DPRODUCT=\"$(PRODUCT)\" \ - -DVERSION=\"$(VERSION)\" + -DVERSION=\"$(VERSION)\" \ + -DHAVE_SIGNAL_H=1 \ + -DPACKAGE_STRING=\"GNU\ M4\ 1.4.4\" LDFLAGS = -L . -lm4 diff --git a/sysa/m4-1.4/patches/signal-include.patch b/sysa/m4-1.4/patches/signal-include.patch deleted file mode 100644 index c027475..0000000 --- a/sysa/m4-1.4/patches/signal-include.patch +++ /dev/null @@ -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 --#include -+#include - - static void usage _((int)); - diff --git a/sysa/run.sh b/sysa/run.sh index 6e3d750..b3cd7a4 100755 --- 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