diff options
| -rw-r--r-- | patches/gettext-0.18.1.1/0001-check-if-gets-is-defined-before-undefining-it.patch | 60 | ||||
| -rw-r--r-- | patches/gettext-0.18.1.1/series | 4 | ||||
| -rw-r--r-- | rules/gettext.make | 21 | ||||
| -rw-r--r-- | rules/host-gettext.make | 7 |
4 files changed, 19 insertions, 73 deletions
diff --git a/patches/gettext-0.18.1.1/0001-check-if-gets-is-defined-before-undefining-it.patch b/patches/gettext-0.18.1.1/0001-check-if-gets-is-defined-before-undefining-it.patch deleted file mode 100644 index df451a9a4..000000000 --- a/patches/gettext-0.18.1.1/0001-check-if-gets-is-defined-before-undefining-it.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Tue, 16 Oct 2012 13:35:50 +0200 -Subject: [PATCH] check if 'gets' is defined before undefining it - -otherwise compiling fails with glibc-2.16 with - -./stdio.h:456:1: error: 'gets' undeclared here (not in a function) - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - gettext-runtime/gnulib-lib/stdio.in.h | 2 ++ - gettext-tools/gnulib-lib/stdio.in.h | 2 ++ - gettext-tools/libgettextpo/stdio.in.h | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/gettext-runtime/gnulib-lib/stdio.in.h b/gettext-runtime/gnulib-lib/stdio.in.h -index c43848e..fc0d61b 100644 ---- a/gettext-runtime/gnulib-lib/stdio.in.h -+++ b/gettext-runtime/gnulib-lib/stdio.in.h -@@ -140,8 +140,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -diff --git a/gettext-tools/gnulib-lib/stdio.in.h b/gettext-tools/gnulib-lib/stdio.in.h -index c43848e..fc0d61b 100644 ---- a/gettext-tools/gnulib-lib/stdio.in.h -+++ b/gettext-tools/gnulib-lib/stdio.in.h -@@ -140,8 +140,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ -diff --git a/gettext-tools/libgettextpo/stdio.in.h b/gettext-tools/libgettextpo/stdio.in.h -index c43848e..fc0d61b 100644 ---- a/gettext-tools/libgettextpo/stdio.in.h -+++ b/gettext-tools/libgettextpo/stdio.in.h -@@ -140,8 +140,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/patches/gettext-0.18.1.1/series b/patches/gettext-0.18.1.1/series deleted file mode 100644 index c60e95474..000000000 --- a/patches/gettext-0.18.1.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-check-if-gets-is-defined-before-undefining-it.patch -# 2085453e433cc2210e35e989cdb120e4 - git-ptx-patches magic diff --git a/rules/gettext.make b/rules/gettext.make index a999417a4..d0ac0e76c 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext # # Paths and names # -GETTEXT_VERSION := 0.18.1.1 -GETTEXT_MD5 := 3dd55b952826d2b32f51308f2f91aa89 +GETTEXT_VERSION := 0.18.3.2 +GETTEXT_MD5 := 241aba309d07aa428252c74b40a818ef GETTEXT := gettext-$(GETTEXT_VERSION) GETTEXT_SUFFIX := tar.gz GETTEXT_URL := $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX)) @@ -41,15 +41,20 @@ GETTEXT_AUTOCONF := \ --disable-java \ --disable-native-java \ --disable-csharp \ + $(GLOBAL_LARGE_FILE_OPTION) \ --enable-threads=posix \ + --enable-static \ + --disable-nls \ --disable-rpath \ + --disable-c++ \ --disable-relocatable \ --enable-libasprintf \ - --disable-acl \ --disable-openmp \ - $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-acl \ --disable-curses \ - --without-emacs + --without-emacs \ + --without-bzip2 \ + --without-xz # ---------------------------------------------------------------------------- # Target-Install @@ -67,10 +72,10 @@ $(STATEDIR)/gettext.targetinstall: @$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/xgettext) @$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/gettext) - @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextlib-0.18.1.so) + @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextlib-0.18.3.so) @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libasprintf.so.0.0.0) - @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextpo.so.0.5.1) - @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextsrc-0.18.1.so) + @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextpo.so.0.5.2) + @$(call install_copy, gettext, 0, 0, 0644, -, /usr/lib/libgettextsrc-0.18.3.so) @$(call install_finish, gettext) diff --git a/rules/host-gettext.make b/rules/host-gettext.make index 1cd10bc7c..08d8d9166 100644 --- a/rules/host-gettext.make +++ b/rules/host-gettext.make @@ -29,7 +29,12 @@ HOST_GETTEXT_AUTOCONF := \ --disable-libasprintf \ --disable-native-java \ --disable-openmp \ + --disable-c++ \ --enable-relocatable \ - --without-emacs + --disable-openmp \ + --disable-curses \ + --without-emacs \ + --without-bzip2 \ + --without-xz # vim: syntax=make |