summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-14 21:36:27 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-14 21:36:27 +0000
commit5dfe764664874280a006e1f27ffd8762c53242fc (patch)
tree877e5e6a4667e2adea4bba314ab7befbe6cb5ef0 /meta
parentc717e0b38465c02329d60d475a97c3da1dfd7637 (diff)
downloadpoky-5dfe764664874280a006e1f27ffd8762c53242fc.tar.gz
gettext: Disable java since it finds any native gcj and breaks cross compiled builds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3167 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gettext/gettext-0.14.1/disable_java.patch33
-rw-r--r--meta/packages/gettext/gettext_0.14.1.bb3
2 files changed, 35 insertions, 1 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
new file mode 100644
index 0000000000..0c641eb91b
--- /dev/null
+++ b/meta/packages/gettext/gettext-0.14.1/disable_java.patch
@@ -0,0 +1,33 @@
1Index: gettext-0.14.1/gettext-tools/configure.ac
2===================================================================
3--- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000
4+++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000
5@@ -37,28 +37,16 @@
6 AC_PROG_YACC
7
8 gt_GCJ
9-if test -n "$HAVE_GCJ"; then
10- BUILDJAVAEXE=yes
11-else
12 BUILDJAVAEXE=no
13-fi
14 AC_SUBST(BUILDJAVAEXE)
15
16 gt_JAVACOMP
17 AC_CHECK_PROG(JAR, jar, jar)
18-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
19- BUILDJAVA=yes
20-else
21 BUILDJAVA=no
22-fi
23 AC_SUBST(BUILDJAVA)
24
25 gt_JAVAEXEC
26-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
27- TESTJAVA=yes
28-else
29 TESTJAVA=no
30-fi
31 AC_SUBST(TESTJAVA)
32
33 gt_CSHARPCOMP
diff --git a/meta/packages/gettext/gettext_0.14.1.bb b/meta/packages/gettext/gettext_0.14.1.bb
index 1cc272bf14..d766369b68 100644
--- a/meta/packages/gettext/gettext_0.14.1.bb
+++ b/meta/packages/gettext/gettext_0.14.1.bb
@@ -8,7 +8,8 @@ PROVIDES = "virtual/libintl"
8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
9 file://gettext-vpath.patch;patch=1;pnum=1 \ 9 file://gettext-vpath.patch;patch=1;pnum=1 \
10 file://fixchicken.patch;patch=1;pnum=1 \ 10 file://fixchicken.patch;patch=1;pnum=1 \
11 file://getline.m4.patch;patch=1" 11 file://getline.m4.patch;patch=1 \
12 file://disable_java.patch;patch=1"
12 13
13SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" 14SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
14SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" 15SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"