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/disable_java.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/disable_java.patch')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch new file mode 100644 index 0000000000..cf7dc55b68 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | # Pulled from OpenEmbedded | ||
2 | # | ||
3 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
4 | |||
5 | Index: gettext-0.16.1/gettext-tools/configure.ac | ||
6 | =================================================================== | ||
7 | --- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800 | ||
8 | +++ gettext-0.16.1/gettext-tools/configure.ac 2011-03-16 16:55:36.111396557 -0700 | ||
9 | @@ -36,27 +36,15 @@ | ||
10 | gt_JAVA_CHOICE | ||
11 | |||
12 | gt_GCJ | ||
13 | -if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then | ||
14 | - BUILDJAVAEXE=yes | ||
15 | -else | ||
16 | BUILDJAVAEXE=no | ||
17 | -fi | ||
18 | AC_SUBST(BUILDJAVAEXE) | ||
19 | |||
20 | gt_JAVAEXEC | ||
21 | gt_JAVACOMP([1.3]) | ||
22 | AC_CHECK_PROG(JAR, jar, jar) | ||
23 | -if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then | ||
24 | - BUILDJAVA=yes | ||
25 | -else | ||
26 | BUILDJAVA=no | ||
27 | -fi | ||
28 | AC_SUBST(BUILDJAVA) | ||
29 | -if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then | ||
30 | - TESTJAVA=yes | ||
31 | -else | ||
32 | TESTJAVA=no | ||
33 | -fi | ||
34 | AC_SUBST(TESTJAVA) | ||
35 | |||
36 | gt_CSHARPCOMP | ||