summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-11 16:58:41 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-11 16:58:41 +0000
commitcfa8d222790389b04df45ec4bbeda5d9bf617ee7 (patch)
treed8037c85338205ada4988bf64915a50157318c5d /meta
parent251ff09c88da73b6050f58895867b4416b643c45 (diff)
downloadopenembedded-core-cfa8d222790389b04df45ec4bbeda5d9bf617ee7.tar.gz
openembedded-core-cfa8d222790389b04df45ec4bbeda5d9bf617ee7.tar.bz2
openembedded-core-cfa8d222790389b04df45ec4bbeda5d9bf617ee7.zip
gettext: Really disable java
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3751 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gettext/gettext-0.14.1/disable_java.patch21
-rw-r--r--meta/packages/gettext/gettext_0.14.1.bb2
2 files changed, 20 insertions, 3 deletions
diff --git a/meta/packages/gettext/gettext-0.14.1/disable_java.patch b/meta/packages/gettext/gettext-0.14.1/disable_java.patch
index 0c641eb91b..1f7670b016 100644
--- a/meta/packages/gettext/gettext-0.14.1/disable_java.patch
+++ b/meta/packages/gettext/gettext-0.14.1/disable_java.patch
@@ -1,7 +1,7 @@
Index: gettext-0.14.1/gettext-tools/configure.ac
===================================================================
---- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000
-+++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000
+--- gettext-0.14.1.orig/gettext-tools/configure.ac 2008-02-11 16:57:19.000000000 +0000
++++ gettext-0.14.1/gettext-tools/configure.ac 2008-02-11 16:57:28.000000000 +0000
@@ -37,28 +37,16 @@
AC_PROG_YACC
@@ -31,3 +31,20 @@ Index: gettext-0.14.1/gettext-tools/configure.ac
AC_SUBST(TESTJAVA)
gt_CSHARPCOMP
+Index: gettext-0.14.1/gettext-runtime/configure.ac
+===================================================================
+--- gettext-0.14.1.orig/gettext-runtime/configure.ac 2008-02-11 16:57:34.000000000 +0000
++++ gettext-0.14.1/gettext-runtime/configure.ac 2008-02-11 16:58:04.000000000 +0000
+@@ -37,11 +37,7 @@
+
+ gt_JAVACOMP
+ AC_CHECK_PROG(JAR, jar, jar)
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+- BUILDJAVA=yes
+-else
+- BUILDJAVA=no
+-fi
++BUILDJAVA=no
+ AC_SUBST(BUILDJAVA)
+
+ gt_CSHARPCOMP
diff --git a/meta/packages/gettext/gettext_0.14.1.bb b/meta/packages/gettext/gettext_0.14.1.bb
index d766369b68..0862f12316 100644
--- a/meta/packages/gettext/gettext_0.14.1.bb
+++ b/meta/packages/gettext/gettext_0.14.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
PROVIDES = "virtual/libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \