diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-03-16 00:01:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 15:33:01 +0000 |
commit | 647ca07b3e72e9b8042bc709e64c81d784624a12 (patch) | |
tree | b339b332c64274a58984a88a2a946e5714197e23 /meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch | |
parent | 6c07b145fff1d0617ec71f6a0ab25715da8b0e29 (diff) | |
download | poky-647ca07b3e72e9b8042bc709e64c81d784624a12.tar.gz |
gnutls: Update to 2.12.17
(From OE-Core rev: bb7e461b08783a2acfef2f13b577ca9109c065fd)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch new file mode 100644 index 0000000000..4c9137a657 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | |||
2 | Upstream-Status: Inappropriate [configuration] | ||
3 | |||
4 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
5 | |||
6 | Index: gnutls-2.12.14/lib/po/Makefile.in.in | ||
7 | =================================================================== | ||
8 | --- gnutls-2.12.14.orig/lib/po/Makefile.in.in | ||
9 | +++ gnutls-2.12.14/lib/po/Makefile.in.in | ||
10 | @@ -8,8 +8,8 @@ | ||
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. | ||
13 | # | ||
14 | -# Origin: gettext-0.17 | ||
15 | -GETTEXT_MACRO_VERSION = 0.17 | ||
16 | +# Origin: gettext-0.18 | ||
17 | +GETTEXT_MACRO_VERSION = 0.18 | ||
18 | |||
19 | PACKAGE = @PACKAGE@ | ||
20 | VERSION = @VERSION@ | ||
21 | Index: gnutls-2.12.14/lib/m4/po.m4 | ||
22 | =================================================================== | ||
23 | --- gnutls-2.12.14.orig/lib/m4/po.m4 | ||
24 | +++ gnutls-2.12.14/lib/m4/po.m4 | ||
25 | @@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS], | ||
26 | |||
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. | ||
29 | - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) | ||
30 | + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) | ||
31 | |||
32 | dnl Perform the following tests also if --disable-nls has been given, | ||
33 | dnl because they are needed for "make dist" to work. | ||
34 | Index: 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 | |||