aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-02-25 17:55:57 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-02-25 22:23:11 +0100
commitcd63c72ac0f99013de03e9eb9f59f930364ee869 (patch)
tree5c0725b7da1560916524906c0e2c8b8146d7df0a
parent83096c2ebba8e17cde48058931caa1211fa8c080 (diff)
downloadmeta-java-cd63c72ac0f99013de03e9eb9f59f930364ee869.tar.gz
meta-java-cd63c72ac0f99013de03e9eb9f59f930364ee869.tar.bz2
meta-java-cd63c72ac0f99013de03e9eb9f59f930364ee869.zip
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 <koen@dominion.thruhere.net>
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-release-25b30.inc2
2 files changed, 15 insertions, 0 deletions
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 = "\