diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-12-20 01:39:30 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-12-21 21:07:29 +0100 |
commit | 314631bf01cefcaa0fa5e0a5a6edb6e9cedca415 (patch) | |
tree | a887a2956f363627150ebbbfbd896225159fd20d | |
parent | 1189bc2d8b7b3c5c3f365e59bc0b75c0e9015b15 (diff) | |
download | meta-java-314631bf01cefcaa0fa5e0a5a6edb6e9cedca415.tar.gz |
icedtea6-native: add the jar-rhino-rewriter-fix
*bump PR
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch | 13 | ||||
-rw-r--r-- | recipes-core/icedtea/icedtea6-native_1.8.11.bb | 3 |
2 files changed, 15 insertions, 1 deletions
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 @@ | |||
1 | Index: icedtea6-1.8.11/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.11.orig/Makefile.am 2011-12-20 00:49:21.000000000 +0100 | ||
4 | +++ icedtea6-1.8.11/Makefile.am 2011-12-20 01:07:08.431134312 +0100 | ||
5 | @@ -1877,7 +1877,7 @@ | ||
6 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
7 | if WITH_RHINO | ||
8 | mkdir -p rhino/rhino.{old,new} | ||
9 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
10 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
11 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
12 | com.redhat.rewriter.ClassRewriter \ | ||
13 | $(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 | |||
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
6 | 6 | ||
7 | PR = "${INC_PR}.0" | 7 | PR = "${INC_PR}.1" |
8 | 8 | ||
9 | SRC_URI = "\ | 9 | SRC_URI = "\ |
10 | http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ | 10 | http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ |
@@ -15,6 +15,7 @@ SRC_URI = "\ | |||
15 | file://disable-library-checks.patch \ | 15 | file://disable-library-checks.patch \ |
16 | file://build-hacks-native.patch \ | 16 | file://build-hacks-native.patch \ |
17 | file://icedtea-sane-x86-arch-name.patch \ | 17 | file://icedtea-sane-x86-arch-name.patch \ |
18 | file://icedtea-fix-jar-path.patch \ | ||
18 | ${ICEDTEA_PATCHES} \ | 19 | ${ICEDTEA_PATCHES} \ |
19 | " | 20 | " |
20 | SRC_URI[ojdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" | 21 | SRC_URI[ojdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" |