From 3037c1febc3df75cd811dbde59a03dd077df162c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Feb 2014 17:55:57 +0100 Subject: openjdk-7-release-25b30.inc: add patch to fix hotstop build When using --enable-zero=no the build will fail without this patch. Signed-off-by: Koen Kooi --- .../icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch | 13 +++++++++++++ recipes-core/openjdk/openjdk-7-release-25b30.inc | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch new file mode 100644 index 0000000..3f7d70a --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch @@ -0,0 +1,13 @@ +diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile +index 898272e..c5ca547 100644 +--- openjdk/jdk/make/java/nio/Makefile ++++ openjdk/jdk/make/java/nio/Makefile +@@ -48,6 +48,8 @@ include FILES_java.gmk + include FILES_c.gmk + include Exportedfiles.gmk + ++NIO_PLATFORM_CLASSES_ROOT_DIR = ++ + ifeq ($(PLATFORM), windows) + FILES_java += \ + sun/nio/ch/Iocp.java \ diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc index f5239d3..ccb6381 100644 --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc @@ -79,6 +79,7 @@ ICEDTEAPATCHES = "\ file://icedtea-corba-parallel-make.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ + file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc = " \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ @@ -108,6 +109,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-corba-parallel-make.patch \ patches/icedtea-zero-hotspotfix.patch \ patches/icedtea-jdk-nio-use-host-cc.patch \ + patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\ -- cgit v1.2.3-54-g00ecf