aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-02-25 17:38:30 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-02-25 22:22:46 +0100
commit83096c2ebba8e17cde48058931caa1211fa8c080 (patch)
treed904d37faa4d6d7514702ab81e03c2c3fae09497
parent7b66b4940804b72150b33248b16b582ae6a48751 (diff)
downloadmeta-java-83096c2ebba8e17cde48058931caa1211fa8c080.tar.gz
meta-java-83096c2ebba8e17cde48058931caa1211fa8c080.tar.bz2
meta-java-83096c2ebba8e17cde48058931caa1211fa8c080.zip
openjdk-7-release-25b30.inc: move nio patch to main section.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--recipes-core/openjdk/openjdk-7-release-25b30.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
index 11dce64..f5239d3 100644
--- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
+++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
@@ -78,14 +78,13 @@ ICEDTEAPATCHES = "\
file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \
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 \
"
ICEDTEAPATCHES_append_powerpc = " \
- file://icedtea-jdk-nio-use-host-cc.patch;apply=no \
file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \
file://icedtea-jdk-powerpc-atomic64.patch;apply=no \
"
ICEDTEAPATCHES_append_powerpc64 = " \
- file://icedtea-jdk-nio-use-host-cc.patch;apply=no \
file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \
"
ICEDTEAPATCHES_append_libc-uclibc = " \
@@ -108,6 +107,7 @@ DISTRIBUTION_PATCHES = "\
patches/icedtea-shark-arm-linux-cpu-detection.patch \
patches/icedtea-corba-parallel-make.patch \
patches/icedtea-zero-hotspotfix.patch \
+ patches/icedtea-jdk-nio-use-host-cc.patch \
"
DISTRIBUTION_PATCHES_append_libc-uclibc = "\
@@ -122,12 +122,10 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\
"
DISTRIBUTION_PATCHES_append_powerpc = " \
- patches/icedtea-jdk-nio-use-host-cc.patch \
patches/icedtea-jdk-ppc64-jvm-cfg.patch \
patches/icedtea-jdk-powerpc-atomic64.patch \
"
DISTRIBUTION_PATCHES_append_powerpc64 = " \
- patches/icedtea-jdk-nio-use-host-cc.patch \
patches/icedtea-jdk-ppc64-jvm-cfg.patch \
"
export DISTRIBUTION_PATCHES