diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-14 21:36:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-14 21:36:27 +0000 |
| commit | 5dfe764664874280a006e1f27ffd8762c53242fc (patch) | |
| tree | 877e5e6a4667e2adea4bba314ab7befbe6cb5ef0 | |
| parent | c717e0b38465c02329d60d475a97c3da1dfd7637 (diff) | |
| download | openembedded-core-5dfe764664874280a006e1f27ffd8762c53242fc.tar.gz openembedded-core-5dfe764664874280a006e1f27ffd8762c53242fc.tar.bz2 openembedded-core-5dfe764664874280a006e1f27ffd8762c53242fc.zip | |
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
| -rw-r--r-- | meta/packages/gettext/gettext-0.14.1/disable_java.patch | 33 | ||||
| -rw-r--r-- | meta/packages/gettext/gettext_0.14.1.bb | 3 |
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 @@ +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 +@@ -37,28 +37,16 @@ + AC_PROG_YACC + + gt_GCJ +-if test -n "$HAVE_GCJ"; then +- BUILDJAVAEXE=yes +-else + BUILDJAVAEXE=no +-fi + AC_SUBST(BUILDJAVAEXE) + + gt_JAVACOMP + AC_CHECK_PROG(JAR, jar, jar) +-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +- BUILDJAVA=yes +-else + BUILDJAVA=no +-fi + AC_SUBST(BUILDJAVA) + + gt_JAVAEXEC +-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then +- TESTJAVA=yes +-else + TESTJAVA=no +-fi + AC_SUBST(TESTJAVA) + + 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" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://gettext-vpath.patch;patch=1;pnum=1 \ file://fixchicken.patch;patch=1;pnum=1 \ - file://getline.m4.patch;patch=1" + file://getline.m4.patch;patch=1 \ + file://disable_java.patch;patch=1" SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" |