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 15:58:31 +0000 |
| commit | e897103a58ad672cc87d2bab3ec45501ef09f8f1 (patch) | |
| tree | b387b8d7dcaacdee23b5e905f5a63d41a8b215b2 /meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch | |
| parent | 5abe730df009931f5745aadf613d64fe964f94b2 (diff) | |
| download | openembedded-core-contrib-e897103a58ad672cc87d2bab3ec45501ef09f8f1.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.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ +# Pulled from OpenEmbedded +# +# Commented by: Saul Wold <saul.wold@intel.com> + +Index: gettext-0.16.1/gettext-tools/configure.ac +=================================================================== +--- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800 ++++ gettext-0.16.1/gettext-tools/configure.ac 2011-03-16 16:55:36.111396557 -0700 +@@ -36,27 +36,15 @@ + gt_JAVA_CHOICE + + gt_GCJ +-if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then +- BUILDJAVAEXE=yes +-else + BUILDJAVAEXE=no +-fi + AC_SUBST(BUILDJAVAEXE) + + gt_JAVAEXEC + gt_JAVACOMP([1.3]) + AC_CHECK_PROG(JAR, jar, jar) +-if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then +- BUILDJAVA=yes +-else + BUILDJAVA=no +-fi + AC_SUBST(BUILDJAVA) +-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then +- TESTJAVA=yes +-else + TESTJAVA=no +-fi + AC_SUBST(TESTJAVA) + + gt_CSHARPCOMP |