diff options
| -rw-r--r-- | recipes/openjdk/openjdk-6-6b18-1.8/thumbee.patch | 15 | ||||
| -rw-r--r-- | recipes/openjdk/openjdk-6-common.inc | 2 | ||||
| -rw-r--r-- | recipes/openjdk/openjdk-6-release-6b18.inc | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/thumbee.patch b/recipes/openjdk/openjdk-6-6b18-1.8/thumbee.patch deleted file mode 100644 index e436f8d341..0000000000 --- a/recipes/openjdk/openjdk-6-6b18-1.8/thumbee.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make -=================================================================== ---- icedtea6-1.8.orig/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:42:36.000000000 +0200 -+++ icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:46:55.264667548 +0200 -@@ -31,8 +31,8 @@ - Obj_Files += cppInterpreter_arm.o - Obj_Files += thumb2.o - --CFLAGS += -DHOTSPOT_ASM --CCFLAGS += -DHOTSPOT_ASM -+CFLAGS += -DHOTSPOT_ASM -DTHUMB2EE -+CCFLAGS += -DHOTSPOT_ASM -DTHUMB2EE - - ifeq ($(CROSS_COMPILATION, true) - C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc index 1f0440f79a..9db2a7c433 100644 --- a/recipes/openjdk/openjdk-6-common.inc +++ b/recipes/openjdk/openjdk-6-common.inc @@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "\ ${ICEDTEA_URI} \ diff --git a/recipes/openjdk/openjdk-6-release-6b18.inc b/recipes/openjdk/openjdk-6-release-6b18.inc index a3a02b015b..b20d5386c5 100644 --- a/recipes/openjdk/openjdk-6-release-6b18.inc +++ b/recipes/openjdk/openjdk-6-release-6b18.inc @@ -39,7 +39,6 @@ OEPATCHES = "\ file://zero-cmpswap-long.patch \ file://fix_hotspot_crosscompile.patch \ file://mkbc_returncode.patch \ - file://thumbee.patch \ file://icedtea-fix-jar-command.patch \ file://fix-llvm-libs.patch \ file://shark-build-openjdkdir.patch \ |