icedtea6-native_1.7.3: backport patch for building without jar in system

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/icedtea/icedtea6-native-1.7.3/icedtea-fix-jar-path.patch b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-fix-jar-path.patch
new file mode 100644 (file)
index 0000000..beeb402
--- /dev/null
+++ b/recipes/icedtea/icedtea6-native-1.7.3/icedtea-fix-jar-path.patch
@@ -0,0 +1,43 @@
+# Backported from
+# HG changeset patch
+# User Xerxes R?nby <xerxes@zafena.se>
+# Date 1275385110 -7200
+# Node ID 7674917fa451a17a38b8cd6930068e8dc3b57b76
+# Parent cf45c29fbe48d2a0c543cbd6d03f4329010011c0
+Use full path to jar application to avoid relying on the one on the path.
+
+2010-06-01  Xerxes R?nby  <xerxes@zafena.se>
+
+       * Makefile.am:
+       (extra-lib/about.jar): Remove redundant
+       conditional that we don't need any more.
+       (rewrite-rhino.stamp): Use full path to
+       jar application to avoid relying on the one
+       on the path.
+
+diff -uNr icedtea6-1.7.3.orig/Makefile.am icedtea6-1.7.3/Makefile.am
+--- icedtea6-1.7.3.orig/Makefile.am    2010-03-31 23:34:07.000000000 +0200
++++ icedtea6-1.7.3/Makefile.am 2010-07-14 16:52:45.000000000 +0200
+@@ -1636,12 +1636,7 @@
+       rm -f extra-source-files.txt
+ 
+ extra-lib/about.jar: stamps/extra-class-files.stamp
+-      if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+-      then \
+-        $(JAR) cf $@ -C extra-lib net ; \
+-      else \
+-        $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
+-      fi
++      $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
+ 
+ # PulseAudio based mixer
+ # (pulse-java)
+@@ -1749,7 +1744,7 @@
+ stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
+ if WITH_RHINO
+       mkdir -p rhino/rhino.{old,new}
+-      (cd rhino/rhino.old ; jar xf $(RHINO_JAR))
++      (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR))
+       $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+         com.redhat.rewriter.ClassRewriter \
+         $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \

diff --git a/recipes/icedtea/icedtea6-native_1.7.3.bb b/recipes/icedtea/icedtea6-native_1.7.3.bb
index 6689ff8..9ac7aa6 100644 (file)
--- a/recipes/icedtea/icedtea6-native_1.7.3.bb
+++ b/recipes/icedtea/icedtea6-native_1.7.3.bb
@@ -6,6 +6,7 @@ SRC_URI = "\
        http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \
        http://download.java.net/openjdk/jdk6/promoted/b17/openjdk-6-src-b17-14_oct_2009.tar.gz;subdir=openjdk-src-dir;name=ojdk \
        file://disable-library-checks.patch \
+       file://icedtea-fix-jar-path.patch \
        file://build-hacks-native.patch \
        file://icedtea-sane-x86-arch-name.patch \
         file://icedtea-javac-in.patch \