m4: Bump to 1.4.19

This commit is contained in:
Yaksh Bariya 2021-08-06 17:15:18 +05:30
parent d6ef78f9fc
commit e42a48a045
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
4 changed files with 6 additions and 56 deletions

View File

@ -2,10 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/m4/m4.html
TERMUX_PKG_DESCRIPTION="Traditional Unix macro processor" TERMUX_PKG_DESCRIPTION="Traditional Unix macro processor"
TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.4.18 TERMUX_PKG_VERSION=1.4.19
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/m4/m4-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/m4/m4-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 TERMUX_PKG_SHA256=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_header_spawn_h=no ac_cv_header_spawn_h=no
" "
termux_step_pre_configure() {
CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0"
}

View File

@ -1,15 +1,3 @@
diff -uNr m4-1.4.18/lib/spawni.c m4-1.4.18.mod/lib/spawni.c
--- m4-1.4.18/lib/spawni.c 2016-12-31 15:54:42.000000000 +0200
+++ m4-1.4.18.mod/lib/spawni.c 2019-03-01 20:54:18.601984363 +0200
@@ -32,7 +32,7 @@
#if _LIBC || HAVE_PATHS_H
# include <paths.h>
#else
-# define _PATH_BSHELL "/bin/sh"
+# define _PATH_BSHELL "@TERMUX_PREFIX@/bin/sh"
#endif
#include <signal.h>
diff -uNr m4-1.4.18/lib/tempname.c m4-1.4.18.mod/lib/tempname.c diff -uNr m4-1.4.18/lib/tempname.c m4-1.4.18.mod/lib/tempname.c
--- m4-1.4.18/lib/tempname.c 2016-12-31 15:54:42.000000000 +0200 --- m4-1.4.18/lib/tempname.c 2016-12-31 15:54:42.000000000 +0200
+++ m4-1.4.18.mod/lib/tempname.c 2019-03-01 20:52:48.978132063 +0200 +++ m4-1.4.18.mod/lib/tempname.c 2019-03-01 20:52:48.978132063 +0200

View File

@ -1,12 +0,0 @@
diff -u -r ../m4-1.4.18/lib/vasnprintf.c ./lib/vasnprintf.c
--- ../m4-1.4.18/lib/vasnprintf.c 2016-12-31 13:54:42.000000000 +0000
+++ ./lib/vasnprintf.c 2019-10-02 19:32:13.576211922 +0000
@@ -4858,7 +4858,7 @@
#endif
*fbp = dp->conversion;
#if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || defined(__ANDROID__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';

View File

@ -1,29 +0,0 @@
Fixed "undefined reference to __muloti4".
diff -u -r ../m4-1.4.18/lib/xalloc-oversized.h ./lib/xalloc-oversized.h
--- ../m4-1.4.18/lib/xalloc-oversized.h 2016-12-31 13:54:42.000000000 +0000
+++ ./lib/xalloc-oversized.h 2018-08-06 14:25:19.420628987 +0000
@@ -46,23 +46,6 @@
positive and N must be nonnegative. This is a macro, not a
function, so that it works correctly even when SIZE_MAX < N. */
-#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
-# define xalloc_oversized(n, s) \
- __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
-#elif ((5 <= __GNUC__ \
- || (__has_builtin (__builtin_mul_overflow) \
- && __has_builtin (__builtin_constant_p))) \
- && !__STRICT_ANSI__)
-# define xalloc_oversized(n, s) \
- (__builtin_constant_p (n) && __builtin_constant_p (s) \
- ? __xalloc_oversized (n, s) \
- : ({ __xalloc_count_type __xalloc_count; \
- __builtin_mul_overflow (n, s, &__xalloc_count); }))
-
-/* Other compilers use integer division; this may be slower but is
- more portable. */
-#else
# define xalloc_oversized(n, s) __xalloc_oversized (n, s)
-#endif
#endif /* !XALLOC_OVERSIZED_H_ */