From b78fc95424b5f0fb28246e8c61bb8b4d6a9d733a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 12 Jul 2010 13:29:16 +0200 Subject: openjdk: backport from openembedded-dev Acked-by: Stefan Schmidt Acked-by: Koen Kooi Acked-by: Marcin Juszkiewicz --- .../icedtea-fix-jar-command.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch (limited to 'recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch') diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch new file mode 100644 index 0000000000..607797e81f --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch @@ -0,0 +1,27 @@ +Index: icedtea6-1.8/Makefile.am +=================================================================== +--- icedtea6-1.8.orig/Makefile.am 2010-06-17 10:29:13.654666801 +0200 ++++ icedtea6-1.8/Makefile.am 2010-06-17 10:30:50.334670771 +0200 +@@ -1662,12 +1662,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) +@@ -1750,7 +1745,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 \ -- cgit 1.2.3-korg