diff options
author | Rosen Penev <rosenp@gmail.com> | 2020-07-24 18:18:14 -0700 |
---|---|---|
committer | Paul Spooren <mail@aparcar.org> | 2021-02-16 19:27:55 -1000 |
commit | b59905f04598008458b6545f297e742a3b7414d4 (patch) | |
tree | 32f5762a86004405b4b84fc358c20be9ed18fdef /package/libs/gettext-full/patches/010-m4.patch | |
parent | 0e43f62f21f10d4ee3c151f86d15784a9ec21d69 (diff) | |
download | upstream-b59905f04598008458b6545f297e742a3b7414d4.tar.gz upstream-b59905f04598008458b6545f297e742a3b7414d4.tar.bz2 upstream-b59905f04598008458b6545f297e742a3b7414d4.zip |
gettext-full: update to 0.21
Add m4 patch to avoid conflict with tools/autoconf-archive.
Add build parallel as it seems to work now.
Remove a bunch of uClibc-ng hacks as it is not in the tree anymore.
Format security patch was fixed upstream.
Refreshed other patches.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package/libs/gettext-full/patches/010-m4.patch')
-rw-r--r-- | package/libs/gettext-full/patches/010-m4.patch | 382 |
1 files changed, 382 insertions, 0 deletions
diff --git a/package/libs/gettext-full/patches/010-m4.patch b/package/libs/gettext-full/patches/010-m4.patch new file mode 100644 index 0000000000..d910ab7a21 --- /dev/null +++ b/package/libs/gettext-full/patches/010-m4.patch @@ -0,0 +1,382 @@ +--- a/gettext-runtime/gnulib-m4/stddef_h.m4 ++++ b/gettext-runtime/gnulib-m4/stddef_h.m4 +@@ -8,7 +8,7 @@ dnl with or without modifications, as lo + AC_DEFUN([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) + STDDEF_H= + + dnl Test whether the type max_align_t exists and whether its alignment +--- a/gettext-runtime/gnulib-m4/stdint.m4 ++++ b/gettext-runtime/gnulib-m4/stdint.m4 +@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + AC_REQUIRE([gl_LIMITS_H]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + + dnl For backward compatibility. Some packages may still be testing these + dnl macros. +--- a/gettext-runtime/gnulib-m4/wchar_h.m4 ++++ b/gettext-runtime/gnulib-m4/wchar_h.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H], + + AC_REQUIRE([gl_FEATURES_H]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/gettext-runtime/gnulib-m4/wchar_t.m4 ++++ b/gettext-runtime/gnulib-m4/wchar_t.m4 +@@ -8,7 +8,7 @@ dnl From Bruno Haible. + dnl Test whether <stddef.h> has the 'wchar_t' type. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WCHAR_T], ++AC_DEFUN([gt_TYPE_WCHAR_T_GT], + [ + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [AC_COMPILE_IFELSE( +--- a/gettext-runtime/gnulib-m4/wctype_h.m4 ++++ b/gettext-runtime/gnulib-m4/wctype_h.m4 +@@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_ISWCNTRL]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/gettext-runtime/gnulib-m4/wcwidth.m4 ++++ b/gettext-runtime/gnulib-m4/wcwidth.m4 +@@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH], + dnl Persuade glibc <wchar.h> to declare wcwidth(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + + AC_CHECK_HEADERS_ONCE([wchar.h]) + AC_CHECK_FUNCS_ONCE([wcwidth]) +--- a/gettext-runtime/gnulib-m4/wint_t.m4 ++++ b/gettext-runtime/gnulib-m4/wint_t.m4 +@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint + dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WINT_T], ++AC_DEFUN([gt_TYPE_WINT_T_GT], + [ + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], + [AC_COMPILE_IFELSE( +--- a/gettext-runtime/intl/Makefile.am ++++ b/gettext-runtime/intl/Makefile.am +@@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ ++ -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \ + -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + < $(srcdir)/libgnuintl.in.h \ + | if test '@WOE32DLL@' = yes; then \ +@@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ ++ -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \ + -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + < $(srcdir)/libgnuintl.in.h > libintl.h + MOSTLYCLEANFILES += libintl.h +--- a/gettext-runtime/libasprintf/configure.ac ++++ b/gettext-runtime/libasprintf/configure.ac +@@ -76,8 +76,8 @@ dnl Checks for typedefs, structures, and + AC_C_INLINE + AC_TYPE_SIZE_T + AC_TYPE_LONG_LONG_INT +-gt_TYPE_WCHAR_T +-gt_TYPE_WINT_T ++gt_TYPE_WCHAR_T_GT ++gt_TYPE_WINT_T_GT + AC_TYPE_MBSTATE_T + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], +--- a/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4 ++++ b/gettext-runtime/libasprintf/gnulib-m4/wchar_t.m4 +@@ -8,7 +8,7 @@ dnl From Bruno Haible. + dnl Test whether <stddef.h> has the 'wchar_t' type. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WCHAR_T], ++AC_DEFUN([gt_TYPE_WCHAR_T_GT], + [ + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [AC_COMPILE_IFELSE( +--- a/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4 ++++ b/gettext-runtime/libasprintf/gnulib-m4/wint_t.m4 +@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint + dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WINT_T], ++AC_DEFUN([gt_TYPE_WINT_T_GT], + [ + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], + [AC_COMPILE_IFELSE( +--- a/gettext-runtime/m4/intl.m4 ++++ b/gettext-runtime/m4/intl.m4 +@@ -31,8 +31,8 @@ AC_DEFUN([AM_INTL_SUBDIR], + AC_REQUIRE([gl_VISIBILITY])dnl + AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl + AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl +- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl +- AC_REQUIRE([gt_TYPE_WINT_T])dnl ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT])dnl ++ AC_REQUIRE([gt_TYPE_WINT_T_GT])dnl + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gt_TYPE_INTMAX_T]) + AC_REQUIRE([gt_PRINTF_POSIX]) +--- a/gettext-tools/gnulib-m4/gnulib-comp.m4 ++++ b/gettext-tools/gnulib-m4/gnulib-comp.m4 +@@ -1843,8 +1843,8 @@ changequote([, ])dnl + AC_REQUIRE([gl_SOCKETS]) + gl_TYPE_SOCKLEN_T + gl_STDALIGN_H +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + gl_FUNC_STRERROR_R + if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then + AC_LIBOBJ([strerror_r]) +--- a/gettext-tools/gnulib-m4/stddef_h.m4 ++++ b/gettext-tools/gnulib-m4/stddef_h.m4 +@@ -8,7 +8,7 @@ dnl with or without modifications, as lo + AC_DEFUN([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) + STDDEF_H= + + dnl Test whether the type max_align_t exists and whether its alignment +--- a/gettext-tools/gnulib-m4/stdint.m4 ++++ b/gettext-tools/gnulib-m4/stdint.m4 +@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + AC_REQUIRE([gl_LIMITS_H]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + + dnl For backward compatibility. Some packages may still be testing these + dnl macros. +--- a/gettext-tools/gnulib-m4/vasnprintf.m4 ++++ b/gettext-tools/gnulib-m4/vasnprintf.m4 +@@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], + # Prerequisites of lib/printf-args.h, lib/printf-args.c. + AC_DEFUN([gl_PREREQ_PRINTF_ARGS], + [ +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + ]) + + # Prerequisites of lib/printf-parse.h, lib/printf-parse.c. + AC_DEFUN([gl_PREREQ_PRINTF_PARSE], + [ + AC_REQUIRE([gl_FEATURES_H]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + AC_REQUIRE([AC_TYPE_SIZE_T]) + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], +@@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], + AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], + [ + AC_REQUIRE([AC_FUNC_ALLOCA]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). +--- a/gettext-tools/gnulib-m4/wchar_h.m4 ++++ b/gettext-tools/gnulib-m4/wchar_h.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H], + + AC_REQUIRE([gl_FEATURES_H]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/gettext-tools/gnulib-m4/wchar_t.m4 ++++ b/gettext-tools/gnulib-m4/wchar_t.m4 +@@ -8,7 +8,7 @@ dnl From Bruno Haible. + dnl Test whether <stddef.h> has the 'wchar_t' type. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WCHAR_T], ++AC_DEFUN([gt_TYPE_WCHAR_T_GT], + [ + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [AC_COMPILE_IFELSE( +--- a/gettext-tools/gnulib-m4/wctype_h.m4 ++++ b/gettext-tools/gnulib-m4/wctype_h.m4 +@@ -22,7 +22,7 @@ AC_DEFUN([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_ISWCNTRL]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/gettext-tools/gnulib-m4/wcwidth.m4 ++++ b/gettext-tools/gnulib-m4/wcwidth.m4 +@@ -12,8 +12,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH], + dnl Persuade glibc <wchar.h> to declare wcwidth(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + + AC_CHECK_HEADERS_ONCE([wchar.h]) + AC_CHECK_FUNCS_ONCE([wcwidth]) +--- a/gettext-tools/gnulib-m4/wint_t.m4 ++++ b/gettext-tools/gnulib-m4/wint_t.m4 +@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint + dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WINT_T], ++AC_DEFUN([gt_TYPE_WINT_T_GT], + [ + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], + [AC_COMPILE_IFELSE( +--- a/gettext-tools/intl/Makefile.am ++++ b/gettext-tools/intl/Makefile.am +@@ -274,7 +274,7 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ ++ -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \ + -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + < $(srcdir)/libgnuintl.in.h \ + | if test '@WOE32DLL@' = yes; then \ +@@ -294,7 +294,7 @@ libintl.h: $(srcdir)/libgnuintl.in.h + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ +- -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ ++ -e 's,@''HAVE_NAMELESS_LOCALES''@,1,g' \ + -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + < $(srcdir)/libgnuintl.in.h > libintl.h + MOSTLYCLEANFILES += libintl.h +--- a/libtextstyle/gnulib-m4/stddef_h.m4 ++++ b/libtextstyle/gnulib-m4/stddef_h.m4 +@@ -8,7 +8,7 @@ dnl with or without modifications, as lo + AC_DEFUN([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) + STDDEF_H= + + dnl Test whether the type max_align_t exists and whether its alignment +--- a/libtextstyle/gnulib-m4/stdint.m4 ++++ b/libtextstyle/gnulib-m4/stdint.m4 +@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + AC_REQUIRE([gl_LIMITS_H]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + + dnl For backward compatibility. Some packages may still be testing these + dnl macros. +--- a/libtextstyle/gnulib-m4/vasnprintf.m4 ++++ b/libtextstyle/gnulib-m4/vasnprintf.m4 +@@ -32,16 +32,16 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], + # Prerequisites of lib/printf-args.h, lib/printf-args.c. + AC_DEFUN([gl_PREREQ_PRINTF_ARGS], + [ +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + ]) + + # Prerequisites of lib/printf-parse.h, lib/printf-parse.c. + AC_DEFUN([gl_PREREQ_PRINTF_PARSE], + [ + AC_REQUIRE([gl_FEATURES_H]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + AC_REQUIRE([AC_TYPE_SIZE_T]) + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], +@@ -54,8 +54,8 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], + AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], + [ + AC_REQUIRE([AC_FUNC_ALLOCA]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WCHAR_T_GT]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). +--- a/libtextstyle/gnulib-m4/wchar_h.m4 ++++ b/libtextstyle/gnulib-m4/wchar_h.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([gl_WCHAR_H], + + AC_REQUIRE([gl_FEATURES_H]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GT]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/libtextstyle/gnulib-m4/wchar_t.m4 ++++ b/libtextstyle/gnulib-m4/wchar_t.m4 +@@ -8,7 +8,7 @@ dnl From Bruno Haible. + dnl Test whether <stddef.h> has the 'wchar_t' type. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WCHAR_T], ++AC_DEFUN([gt_TYPE_WCHAR_T_GT], + [ + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], + [AC_COMPILE_IFELSE( +--- a/libtextstyle/gnulib-m4/wint_t.m4 ++++ b/libtextstyle/gnulib-m4/wint_t.m4 +@@ -9,7 +9,7 @@ dnl Test whether <wchar.h> has the 'wint + dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WINT_T], ++AC_DEFUN([gt_TYPE_WINT_T_GT], + [ + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], + [AC_COMPILE_IFELSE( |