diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2014-02-25 17:55:57 +0100 | 
|---|---|---|
| committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-02-25 22:23:11 +0100 | 
| commit | cd63c72ac0f99013de03e9eb9f59f930364ee869 (patch) | |
| tree | 5c0725b7da1560916524906c0e2c8b8146d7df0a /recipes-core/openjdk | |
| parent | 83096c2ebba8e17cde48058931caa1211fa8c080 (diff) | |
| download | meta-java-cd63c72ac0f99013de03e9eb9f59f930364ee869.tar.gz | |
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>
Diffstat (limited to 'recipes-core/openjdk')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch | 13 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-release-25b30.inc | 2 | 
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 @@ | |||
| 1 | diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile | ||
| 2 | index 898272e..c5ca547 100644 | ||
| 3 | --- openjdk/jdk/make/java/nio/Makefile | ||
| 4 | +++ openjdk/jdk/make/java/nio/Makefile | ||
| 5 | @@ -48,6 +48,8 @@ include FILES_java.gmk | ||
| 6 | include FILES_c.gmk | ||
| 7 | include Exportedfiles.gmk | ||
| 8 | |||
| 9 | +NIO_PLATFORM_CLASSES_ROOT_DIR = | ||
| 10 | + | ||
| 11 | ifeq ($(PLATFORM), windows) | ||
| 12 | FILES_java += \ | ||
| 13 | 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 = "\ | |||
| 79 | file://icedtea-corba-parallel-make.patch;apply=no \ | 79 | file://icedtea-corba-parallel-make.patch;apply=no \ | 
| 80 | file://icedtea-zero-hotspotfix.patch;apply=no \ | 80 | file://icedtea-zero-hotspotfix.patch;apply=no \ | 
| 81 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | 81 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | 
| 82 | file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \ | ||
| 82 | " | 83 | " | 
| 83 | ICEDTEAPATCHES_append_powerpc = " \ | 84 | ICEDTEAPATCHES_append_powerpc = " \ | 
| 84 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ | 85 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ | 
| @@ -108,6 +109,7 @@ DISTRIBUTION_PATCHES = "\ | |||
| 108 | patches/icedtea-corba-parallel-make.patch \ | 109 | patches/icedtea-corba-parallel-make.patch \ | 
| 109 | patches/icedtea-zero-hotspotfix.patch \ | 110 | patches/icedtea-zero-hotspotfix.patch \ | 
| 110 | patches/icedtea-jdk-nio-use-host-cc.patch \ | 111 | patches/icedtea-jdk-nio-use-host-cc.patch \ | 
| 112 | patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \ | ||
| 111 | " | 113 | " | 
| 112 | 114 | ||
| 113 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | 115 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | 
