gettext: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1784 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 50 insertions, 2 deletions

diff --git a/meta/packages/gettext/gettext-0.14.1/getline.m4.patch b/meta/packages/gettext/gettext-0.14.1/getline.m4.patch
new file mode 100644
index 0000000000..c3f99bb9ae
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.14.1/getline.m4.patch
@@ -0,0 +1,32 @@
+--- /gettext-tools/m4/orig-getline.m4   2003-07-18 18:11:37.000000000 +0300
++++ /gettext-tools/m4/getline.m4        2007-02-03 13:33:41.000000000 +0200
+@@ -42,12 +42,23 @@
+        return 1;
+       len = getline (&line, &siz, in);
+       exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+-    }
+-    ], am_cv_func_working_getline=yes dnl The library version works.
+-    , am_cv_func_working_getline=no dnl The library version does NOT work.
+-    , am_cv_func_working_getline=no dnl We're cross compiling.
+-    )])
+-  fi
++     }
++      ], am_cv_func_working_getline=yes dnl The library version works.
++      , am_cv_func_working_getline=no dnl The library version does NOT work.
++!     , dnl We're cross compiling. Assume ir works on glibc2 systems.
++!       [AC_EGREP_CPP([Lucky GNU user],
++!          [
++! #include <features.h>
++! #ifdef __GNU_LIBRARY__
++!  #if (__GLIBC__ >= 2)
++!   Lucky GNU user
++!  #endif
++! #endif
++!          ],
++!          [am_cv_func_working_getline=yes],
++!          [am_cv_func_working_getline=no])]
++      )])
++    fi 
+ 
+   if test $am_cv_func_working_getline = no; then
+     dnl We must choose a different name for our function, since on ELF systems
diff --git a/meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch b/meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch
new file mode 100644
index 0000000000..615a53edd5
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch
@@ -0,0 +1,12 @@
+diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
+--- gettext-0.14.6/gettext-tools/lib/error.h    2005-05-20 16:03:42.000000000 -0500
++++ gettext-0.14.6-patched/gettext-tools/lib/error.h    2007-01-13 20:57:24.422168053 -0600
+@@ -50,7 +50,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+    name, a colon and a space.  Otherwise, error will call this
+    function without parameters instead.  */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+ 
+ /* This variable is incremented each time `error' is called.  */
+ extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/meta/packages/gettext/gettext_0.14.1.bb b/meta/packages/gettext/gettext_0.14.1.bb
index 9e2222aa0e..1cc272bf14 100644
--- a/meta/packages/gettext/gettext_0.14.1.bb
+++ b/meta/packages/gettext/gettext_0.14.1.bb
@@ -2,12 +2,16 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r5"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://gettext-vpath.patch;patch=1;pnum=1 \
-           file://fixchicken.patch;patch=1;pnum=1"
+           file://fixchicken.patch;patch=1;pnum=1 \
+           file://getline.m4.patch;patch=1"
+
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
 
 PARALLEL_MAKE = ""