X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Flibs%2Fgettext-full%2Fpatches%2F010-m4.patch;fp=package%2Flibs%2Fgettext-full%2Fpatches%2F010-m4.patch;h=fe896db3123db03225e2e35564f768ec4695465c;hp=6d08835e37d6a33aef99318734e05f893cf04121;hb=b6d850317bb9ef8af61eb26e34d5f24ee053a362;hpb=8ad82d31a0b4f8e658680b683e7e63ba2333ba30

diff --git a/package/libs/gettext-full/patches/010-m4.patch b/package/libs/gettext-full/patches/010-m4.patch
index 6d08835e37..fe896db312 100644
--- a/package/libs/gettext-full/patches/010-m4.patch
+++ b/package/libs/gettext-full/patches/010-m4.patch
@@ -1,14 +1,14 @@
 --- 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],
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([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
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 --- a/gettext-runtime/gnulib-m4/stdint.m4
 +++ b/gettext-runtime/gnulib-m4/stdint.m4
 @@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H],
@@ -22,7 +22,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -44,7 +44,7 @@
      [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],
+@@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
    fi
    AC_SUBST([HAVE_ISWCNTRL])
  
@@ -77,26 +77,6 @@
  [
    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''@,0,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''@,0,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
@@ -145,30 +125,6 @@
    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],
@@ -216,7 +172,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -238,7 +194,7 @@
      [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],
+@@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H],
    fi
    AC_SUBST([HAVE_ISWCNTRL])
  
@@ -271,37 +227,6 @@
  [
    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''@,0,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''@,0,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],
@@ -349,7 +274,7 @@
    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],
+@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H],
  
    AC_REQUIRE([gl_FEATURES_H])
  
@@ -380,3 +305,38 @@
  [
    AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
      [AC_COMPILE_IFELSE(
+--- a/gettext-tools/gnulib-m4/gnulib-comp.m4
++++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
+@@ -2218,8 +2218,8 @@ changequote([, ])dnl
+   AC_REQUIRE([gl_SOCKETLIB])
+   AC_REQUIRE([gl_SOCKETS])
+   gl_TYPE_SOCKLEN_T
+-  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
+   AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
+     AC_LIBOBJ([strerror_r])
+--- a/libtextstyle/gnulib-m4/stddef_h.m4
++++ b/libtextstyle/gnulib-m4/stddef_h.m4
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+ 
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+--- a/gettext-tools/gnulib-m4/stddef_h.m4
++++ b/gettext-tools/gnulib-m4/stddef_h.m4
+@@ -9,7 +9,7 @@ dnl A placeholder for <stddef.h>, for pl
+ AC_DEFUN_ONCE([gl_STDDEF_H],
+ [
+   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
+-  AC_REQUIRE([gt_TYPE_WCHAR_T])
++  AC_REQUIRE([gt_TYPE_WCHAR_T_GT])
+ 
+   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])