summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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
-rw-r--r--meta/packages/gettext/gettext_0.14.1.bb8
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 @@
1--- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300
2+++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200
3@@ -42,12 +42,23 @@
4 return 1;
5 len = getline (&line, &siz, in);
6 exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
7- }
8- ], am_cv_func_working_getline=yes dnl The library version works.
9- , am_cv_func_working_getline=no dnl The library version does NOT work.
10- , am_cv_func_working_getline=no dnl We're cross compiling.
11- )])
12- fi
13+ }
14+ ], am_cv_func_working_getline=yes dnl The library version works.
15+ , am_cv_func_working_getline=no dnl The library version does NOT work.
16+! , dnl We're cross compiling. Assume ir works on glibc2 systems.
17+! [AC_EGREP_CPP([Lucky GNU user],
18+! [
19+! #include <features.h>
20+! #ifdef __GNU_LIBRARY__
21+! #if (__GLIBC__ >= 2)
22+! Lucky GNU user
23+! #endif
24+! #endif
25+! ],
26+! [am_cv_func_working_getline=yes],
27+! [am_cv_func_working_getline=no])]
28+ )])
29+ fi
30
31 if test $am_cv_func_working_getline = no; then
32 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 @@
1diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
2--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500
3+++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600
4@@ -50,7 +50,7 @@
5 /* If NULL, error will flush stdout, then print on stderr the program
6 name, a colon and a space. Otherwise, error will call this
7 function without parameters instead. */
8-extern DLL_VARIABLE void (*error_print_progname) (void);
9+void (*error_print_progname) (void);
10
11 /* This variable is incremented each time `error' is called. */
12 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."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" 2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PR = "r3" 5PR = "r5"
6PROVIDES = "virtual/libintl" 6PROVIDES = "virtual/libintl"
7 7
8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
9 file://gettext-vpath.patch;patch=1;pnum=1 \ 9 file://gettext-vpath.patch;patch=1;pnum=1 \
10 file://fixchicken.patch;patch=1;pnum=1" 10 file://fixchicken.patch;patch=1;pnum=1 \
11 file://getline.m4.patch;patch=1"
12
13SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
14SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
11 15
12PARALLEL_MAKE = "" 16PARALLEL_MAKE = ""
13 17