summaryrefslogtreecommitdiff
path: root/meta/packages/gettext/gettext-0.14.1
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-27 19:45:55 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-27 19:45:55 +0000
commitbd4fd028a799e804d803eac14ccb9e164ecc4938 (patch)
tree8931cbccbc1fa9ddfb55923450de744b9d570c96 /meta/packages/gettext/gettext-0.14.1
parent0dd5fc281107dae66acb18e865e1ae0232f87c19 (diff)
downloadopenembedded-core-bd4fd028a799e804d803eac14ccb9e164ecc4938.tar.gz
openembedded-core-bd4fd028a799e804d803eac14ccb9e164ecc4938.tar.bz2
openembedded-core-bd4fd028a799e804d803eac14ccb9e164ecc4938.zip
gettext: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1784 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gettext/gettext-0.14.1')
-rw-r--r--meta/packages/gettext/gettext-0.14.1/getline.m4.patch32
-rw-r--r--meta/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch12
2 files changed, 44 insertions, 0 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;