aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch
diff options
context:
space:
mode:
authorHenning Heinold <h.heinold@tarent.de>2010-07-12 13:29:16 +0200
committerHenning Heinold <h.heinold@tarent.de>2010-08-02 10:23:46 +0200
commitb78fc95424b5f0fb28246e8c61bb8b4d6a9d733a (patch)
treef65f5609aabafe474f1f35bb7e284aa733be1081 /recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch
parent9e043b45ceba7e65565722c7dc14910547b04d17 (diff)
downloadopenembedded-stable/2009.tar.gz
openembedded-stable/2009.tar.bz2
openembedded-stable/2009.zip
openjdk: backport from openembedded-devstable/2009
Acked-by: Stefan Schmidt <stefan@buglabs.net> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Diffstat (limited to 'recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch')
-rw-r--r--recipes/openjdk/openjdk-6-6b18-1.8/icedtea-fix-jar-command.patch27
1 files changed, 27 insertions, 0 deletions
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 \