summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-02 14:38:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:41 +0000
commit78a3b1e5eb9aabfeecd0636e62bd0e98d0a6b5fd (patch)
tree7926731aea8f291f1c77a400e6f4b6173b2b1c96 /meta
parent8eb45acf307e5f30678b4725969e03b5e3f52b4e (diff)
downloadpoky-78a3b1e5eb9aabfeecd0636e62bd0e98d0a6b5fd.tar.gz
gnutls: more gettext version fixes
Address [YOCTO #1849] (From OE-Core rev: 206ebe842ba12db271133a80a3d095c0d659eb45) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch23
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.14.bb2
2 files changed, 19 insertions, 6 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
index a0da765b60..4c9137a657 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
@@ -5,8 +5,8 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
5 5
6Index: gnutls-2.12.14/lib/po/Makefile.in.in 6Index: gnutls-2.12.14/lib/po/Makefile.in.in
7=================================================================== 7===================================================================
8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2009-11-01 01:43:00.000000000 -0800 8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in
9+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-12-05 12:09:34.349552489 -0800 9+++ gnutls-2.12.14/lib/po/Makefile.in.in
10@@ -8,8 +8,8 @@ 10@@ -8,8 +8,8 @@
11 # Please note that the actual code of GNU gettext is covered by the GNU 11 # Please note that the actual code of GNU gettext is covered by the GNU
12 # General Public License and is *not* in the public domain. 12 # General Public License and is *not* in the public domain.
@@ -20,9 +20,9 @@ Index: gnutls-2.12.14/lib/po/Makefile.in.in
20 VERSION = @VERSION@ 20 VERSION = @VERSION@
21Index: gnutls-2.12.14/lib/m4/po.m4 21Index: gnutls-2.12.14/lib/m4/po.m4
22=================================================================== 22===================================================================
23--- gnutls-2.12.14.orig/lib/m4/po.m4 2011-12-05 12:12:34.000000000 -0800 23--- gnutls-2.12.14.orig/lib/m4/po.m4
24+++ gnutls-2.12.14/lib/m4/po.m4 2011-12-05 12:12:49.429552465 -0800 24+++ gnutls-2.12.14/lib/m4/po.m4
25@@ -29,7 +29,7 @@ 25@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
26 26
27 dnl Release version of the gettext macros. This is used to ensure that 27 dnl Release version of the gettext macros. This is used to ensure that
28 dnl the gettext macros and po/Makefile.in.in are in sync. 28 dnl the gettext macros and po/Makefile.in.in are in sync.
@@ -31,3 +31,16 @@ Index: gnutls-2.12.14/lib/m4/po.m4
31 31
32 dnl Perform the following tests also if --disable-nls has been given, 32 dnl Perform the following tests also if --disable-nls has been given,
33 dnl because they are needed for "make dist" to work. 33 dnl because they are needed for "make dist" to work.
34Index: gnutls-2.12.14/lib/configure.ac
35===================================================================
36--- gnutls-2.12.14.orig/lib/configure.ac
37+++ gnutls-2.12.14/lib/configure.ac
38@@ -39,7 +39,7 @@ AC_PROG_LIBTOOL
39 LIBGNUTLS_HOOKS
40
41 AM_GNU_GETTEXT([external])
42-AM_GNU_GETTEXT_VERSION([0.17])
43+AM_GNU_GETTEXT_VERSION([0.18])
44
45 AC_C_BIGENDIAN
46
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index f521f1a672..045ba69d1b 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -1,6 +1,6 @@
1require gnutls.inc 1require gnutls.inc
2 2
3PR = "${INC_PR}.1" 3PR = "${INC_PR}.3"
4 4
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch \ 6 file://configure-fix.patch \