summaryrefslogtreecommitdiffstats
path: root/meta/packages
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/packages
parent251ff09c88da73b6050f58895867b4416b643c45 (diff)
downloadpoky-cfa8d222790389b04df45ec4bbeda5d9bf617ee7.tar.gz
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/packages')
-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 @@
1Index: gettext-0.14.1/gettext-tools/configure.ac 1Index: gettext-0.14.1/gettext-tools/configure.ac
2=================================================================== 2===================================================================
3--- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000 3--- gettext-0.14.1.orig/gettext-tools/configure.ac 2008-02-11 16:57:19.000000000 +0000
4+++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000 4+++ gettext-0.14.1/gettext-tools/configure.ac 2008-02-11 16:57:28.000000000 +0000
5@@ -37,28 +37,16 @@ 5@@ -37,28 +37,16 @@
6 AC_PROG_YACC 6 AC_PROG_YACC
7 7
@@ -31,3 +31,20 @@ Index: gettext-0.14.1/gettext-tools/configure.ac
31 AC_SUBST(TESTJAVA) 31 AC_SUBST(TESTJAVA)
32 32
33 gt_CSHARPCOMP 33 gt_CSHARPCOMP
34Index: gettext-0.14.1/gettext-runtime/configure.ac
35===================================================================
36--- gettext-0.14.1.orig/gettext-runtime/configure.ac 2008-02-11 16:57:34.000000000 +0000
37+++ gettext-0.14.1/gettext-runtime/configure.ac 2008-02-11 16:58:04.000000000 +0000
38@@ -37,11 +37,7 @@
39
40 gt_JAVACOMP
41 AC_CHECK_PROG(JAR, jar, jar)
42-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
43- BUILDJAVA=yes
44-else
45- BUILDJAVA=no
46-fi
47+BUILDJAVA=no
48 AC_SUBST(BUILDJAVA)
49
50 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."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" 2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PR = "r5" 5PR = "r6"
6PROVIDES = "virtual/libintl" 6PROVIDES = "virtual/libintl"
7 7
8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \