diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-22 15:35:03 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-11-22 15:35:03 +0000 |
| commit | fcacf6ef057669597c283ed4d181dc12991334d4 (patch) | |
| tree | 1ed959d274904264bc308e0da54e20f691d78d00 | |
| parent | 68995fcb4b910842d4def97695aa2095c0b853ee (diff) | |
gettext: Disable java since it finds any native gcj and breaks cross compiled builds (from Poky)
| -rw-r--r-- | packages/gettext/gettext-0.14.1/disable_java.patch | 33 | ||||
| -rw-r--r-- | packages/gettext/gettext_0.14.1.bb | 5 |
2 files changed, 36 insertions, 2 deletions
diff --git a/packages/gettext/gettext-0.14.1/disable_java.patch b/packages/gettext/gettext-0.14.1/disable_java.patch new file mode 100644 index 0000000000..0c641eb91b --- /dev/null +++ b/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/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 4e25c0e829..960db30b56 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,13 +2,14 @@ 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 \ 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" |