diff --git a/steps/m4-1.4.7/mk/main.mk b/steps/m4-1.4.10/mk/main.mk similarity index 67% rename from steps/m4-1.4.7/mk/main.mk rename to steps/m4-1.4.10/mk/main.mk index 33f5660b..7506a7b2 100644 --- a/steps/m4-1.4.7/mk/main.mk +++ b/steps/m4-1.4.10/mk/main.mk @@ -7,9 +7,9 @@ CC = tcc AR = tcc -ar CFLAGS = -I lib \ - -DVERSION=\"1.4.7\" \ + -DVERSION=\"1.4.10\" \ -DPACKAGE_BUGREPORT=\"bug-m4@gnu.org\" \ - -DPACKAGE_STRING=\"GNU\ M4\ 1.4.7\" \ + -DPACKAGE_STRING=\"GNU\ M4\ 1.4.10\" \ -DPACKAGE=\"m4\" \ -DPACKAGE_NAME=\"GNU\ M4\" \ -DHAVE_STDINT_H=1 \ @@ -17,14 +17,16 @@ CFLAGS = -I lib \ -DHAVE_DECL___FPENDING=1 \ -D_GNU_SOURCE=1 \ -D_GL_UNUSED= \ + -DGNULIB_CLOSE_STREAM=1 \ -D__getopt_argv_const=const \ - -DSYSCMD_SHELL=\"/bin/sh\" + -DSYSCMD_SHELL=\"/bin/sh\" \ + -DLIBDIR=\"$(LIBDIR)\" LDFLAGS = -L . -lm4 .PHONY: all -LIB_SRC = cloexec close-stream dup-safer error exitfail fd-safer fopen-safer getopt getopt1 mkstemp-safer regex obstack tmpfile-safer verror xalloc-die xasprintf xmalloc xvasprintf +LIB_SRC = clean-temp cloexec close-stream closein closeout dup-safer error exitfail fatal-signal fd-safer fopen-safer getopt getopt1 gl_avltree_oset gl_linkedhash_list gl_list gl_oset localcharset mkstemp-safer regex obstack quotearg tmpdir verror version-etc version-etc-fsf xalloc-die xasprintf xmalloc xvasprintf LIB_OBJECTS = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC))) M4_SRC = m4 builtin debug eval format freeze input macro output path symtab diff --git a/steps/m4-1.4.10/pass1.sh b/steps/m4-1.4.10/pass1.sh new file mode 100644 index 00000000..f9171977 --- /dev/null +++ b/steps/m4-1.4.10/pass1.sh @@ -0,0 +1,5 @@ +src_prepare() { + default + + touch lib/configmake.h +} diff --git a/steps/m4-1.4.10/sources b/steps/m4-1.4.10/sources new file mode 100644 index 00000000..3f57a1d9 --- /dev/null +++ b/steps/m4-1.4.10/sources @@ -0,0 +1 @@ +https://mirrors.kernel.org/gnu/m4/m4-1.4.10.tar.gz 197fcb73c346fa669f143c3f0ec3144271f133647df00b2258bff1fd485cabe0 diff --git a/steps/m4-1.4.7/sources b/steps/m4-1.4.7/sources deleted file mode 100644 index 474e2945..00000000 --- a/steps/m4-1.4.7/sources +++ /dev/null @@ -1 +0,0 @@ -https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.gz 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303 diff --git a/steps/manifest b/steps/manifest index d4575259..1a1ca65a 100644 --- a/steps/manifest +++ b/steps/manifest @@ -63,7 +63,7 @@ build: musl-1.1.24 build: tcc-0.9.27 build: sed-4.0.9 build: bzip2-1.0.8 -build: m4-1.4.7 +build: m4-1.4.10 build: flex-2.6.4 uninstall: /usr/bin/yacc build: bison-3.4.1