diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-03-17 01:12:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 17:40:55 +0000 |
commit | 3072c245da1a36205cd5e258515eff16f6f7f55e (patch) | |
tree | 10633949a1f179d782cb5d6e4ff6934caa5c9d05 /meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch | |
parent | 490bbfbe4b4c7ec9c0942b5fadae1ad12af31c20 (diff) | |
download | poky-3072c245da1a36205cd5e258515eff16f6f7f55e.tar.gz |
gettext: Upgrade GPLv2 version to 0.16.1
This adds a couple of new patches for handling various autoconf
and autolocal issues. It also hardcodes a GETTEXT_MACRO_VERSION
to 0.17 to match the native gettext.
(From OE-Core rev: e897103a58ad672cc87d2bab3ec45501ef09f8f1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch new file mode 100644 index 0000000000..ef57dc254a --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION, | ||
2 | the version check is only part of 0.17 and will not affect any 0.16.1 | ||
3 | operations | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: gettext-0.16.1/gettext-runtime/m4/po.m4 | ||
8 | =================================================================== | ||
9 | --- gettext-0.16.1.orig/gettext-runtime/m4/po.m4 2011-03-17 02:24:28.953520231 -0700 | ||
10 | +++ gettext-0.16.1/gettext-runtime/m4/po.m4 2011-03-17 02:28:25.455396862 -0700 | ||
11 | @@ -27,6 +27,9 @@ | ||
12 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | ||
13 | AC_REQUIRE([AM_NLS])dnl | ||
14 | |||
15 | + dnl Hardcode the MACRO_VERSION to 0.17 for gnutls | ||
16 | + AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) | ||
17 | + | ||
18 | dnl Perform the following tests also if --disable-nls has been given, | ||
19 | dnl because they are needed for "make dist" to work. | ||
20 | |||
21 | Index: gettext-0.16.1/gettext-runtime/po/Makefile.in.in | ||
22 | =================================================================== | ||
23 | --- gettext-0.16.1.orig/gettext-runtime/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 | ||
24 | +++ gettext-0.16.1/gettext-runtime/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 | ||
25 | @@ -10,6 +10,9 @@ | ||
26 | # | ||
27 | # Origin: gettext-0.16 | ||
28 | |||
29 | +# Hardcode this value for gnutls building against gplv2 code | ||
30 | +GETTEXT_MACRO_VERSION = 0.17 | ||
31 | + | ||
32 | PACKAGE = @PACKAGE@ | ||
33 | VERSION = @VERSION@ | ||
34 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
35 | Index: gettext-0.16.1/gettext-tools/po/Makefile.in.in | ||
36 | =================================================================== | ||
37 | --- gettext-0.16.1.orig/gettext-tools/po/Makefile.in.in 2011-03-17 02:24:28.953520231 -0700 | ||
38 | +++ gettext-0.16.1/gettext-tools/po/Makefile.in.in 2011-03-17 02:28:07.574395144 -0700 | ||
39 | @@ -10,6 +10,9 @@ | ||
40 | # | ||
41 | # Origin: gettext-0.16 | ||
42 | |||
43 | +# Hardcode this value for gnutls building against gplv2 code | ||
44 | +GETTEXT_MACRO_VERSION = 0.17 | ||
45 | + | ||
46 | PACKAGE = @PACKAGE@ | ||
47 | VERSION = @VERSION@ | ||
48 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||