Update m4 from 1.4 to 1.4.4.

This commit is contained in:
Andrius Štikonas 2021-02-04 21:29:33 +00:00
parent fb522be854
commit 3e7b17c03e
6 changed files with 10 additions and 21 deletions

View File

@ -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 we have not bootstrapped bison but fortunately for us, heirloom yacc is able to
cope here. 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. `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. It allows macros to be defined and files to be generated from those macros.

View File

@ -130,8 +130,8 @@ get_file http://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070
# bash 2.05b # bash 2.05b
get_file https://ftp.gnu.org/pub/gnu/bash/bash-2.05b.tar.gz get_file https://ftp.gnu.org/pub/gnu/bash/bash-2.05b.tar.gz
# m4 1.4 # m4 1.4.4
get_file https://ftp.gnu.org/gnu/m4/m4-1.4.tar.gz get_file https://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz
# flex 2.5.11 # flex 2.5.11
get_file http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.11.tar.gz get_file http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.11.tar.gz

View File

@ -8,7 +8,9 @@ AR = tcc -ar
CFLAGS = -DPACKAGE=\"$(PACKAGE)\" \ CFLAGS = -DPACKAGE=\"$(PACKAGE)\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
-DHAVE_DIRENT_H=1 \ -DHAVE_DIRENT_H=1 \
-DHAVE_UNISTD_H=1 -DHAVE_UNISTD_H=1 \
-DHAVE_STRERROR=1 \
-DREGEX_MALLOC=1
.PHONY: all .PHONY: all

View File

@ -7,7 +7,9 @@ AR = tcc -ar
CFLAGS = -I lib \ CFLAGS = -I lib \
-DPRODUCT=\"$(PRODUCT)\" \ -DPRODUCT=\"$(PRODUCT)\" \
-DVERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" \
-DHAVE_SIGNAL_H=1 \
-DPACKAGE_STRING=\"GNU\ M4\ 1.4.4\"
LDFLAGS = -L . -lm4 LDFLAGS = -L . -lm4

View File

@ -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));

View File

@ -10,7 +10,7 @@ set -e
export PREFIX=/after export PREFIX=/after
# Part 21 # Part 21
build m4-1.4 build m4-1.4.4
# Part 22 # Part 22
build flex-2.5.11 build flex-2.5.11