From 314631bf01cefcaa0fa5e0a5a6edb6e9cedca415 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 20 Dec 2011 01:39:30 +0100 Subject: icedtea6-native: add the jar-rhino-rewriter-fix *bump PR Signed-off-by: Henning Heinold --- .../icedtea6-native-1.8.11/icedtea-fix-jar-path.patch | 13 +++++++++++++ recipes-core/icedtea/icedtea6-native_1.8.11.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch (limited to 'recipes-core') diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch new file mode 100644 index 0000000..57543fb --- /dev/null +++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch @@ -0,0 +1,13 @@ +Index: icedtea6-1.8.11/Makefile.am +=================================================================== +--- icedtea6-1.8.11.orig/Makefile.am 2011-12-20 00:49:21.000000000 +0100 ++++ icedtea6-1.8.11/Makefile.am 2011-12-20 01:07:08.431134312 +0100 +@@ -1877,7 +1877,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-core/icedtea/icedtea6-native_1.8.11.bb b/recipes-core/icedtea/icedtea6-native_1.8.11.bb index b2c61f6..4e3ff27 100644 --- a/recipes-core/icedtea/icedtea6-native_1.8.11.bb +++ b/recipes-core/icedtea/icedtea6-native_1.8.11.bb @@ -4,7 +4,7 @@ require ${PN}.inc LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "\ http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ @@ -15,6 +15,7 @@ SRC_URI = "\ file://disable-library-checks.patch \ file://build-hacks-native.patch \ file://icedtea-sane-x86-arch-name.patch \ + file://icedtea-fix-jar-path.patch \ ${ICEDTEA_PATCHES} \ " SRC_URI[ojdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" -- cgit v1.2.3-54-g00ecf