diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2014-02-25 17:38:30 +0100 |
---|---|---|
committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-02-25 22:22:46 +0100 |
commit | 83096c2ebba8e17cde48058931caa1211fa8c080 (patch) | |
tree | d904d37faa4d6d7514702ab81e03c2c3fae09497 /recipes-core | |
parent | 7b66b4940804b72150b33248b16b582ae6a48751 (diff) | |
download | meta-java-83096c2ebba8e17cde48058931caa1211fa8c080.tar.gz |
openjdk-7-release-25b30.inc: move nio patch to main section.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-release-25b30.inc | 6 |
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 = "\ | |||
78 | file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ | 78 | file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ |
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 | " | 82 | " |
82 | ICEDTEAPATCHES_append_powerpc = " \ | 83 | ICEDTEAPATCHES_append_powerpc = " \ |
83 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | ||
84 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ | 84 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ |
85 | file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ | 85 | file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ |
86 | " | 86 | " |
87 | ICEDTEAPATCHES_append_powerpc64 = " \ | 87 | ICEDTEAPATCHES_append_powerpc64 = " \ |
88 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | ||
89 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ | 88 | file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ |
90 | " | 89 | " |
91 | ICEDTEAPATCHES_append_libc-uclibc = " \ | 90 | ICEDTEAPATCHES_append_libc-uclibc = " \ |
@@ -108,6 +107,7 @@ DISTRIBUTION_PATCHES = "\ | |||
108 | patches/icedtea-shark-arm-linux-cpu-detection.patch \ | 107 | patches/icedtea-shark-arm-linux-cpu-detection.patch \ |
109 | patches/icedtea-corba-parallel-make.patch \ | 108 | patches/icedtea-corba-parallel-make.patch \ |
110 | patches/icedtea-zero-hotspotfix.patch \ | 109 | patches/icedtea-zero-hotspotfix.patch \ |
110 | patches/icedtea-jdk-nio-use-host-cc.patch \ | ||
111 | " | 111 | " |
112 | 112 | ||
113 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | 113 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ |
@@ -122,12 +122,10 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | |||
122 | " | 122 | " |
123 | 123 | ||
124 | DISTRIBUTION_PATCHES_append_powerpc = " \ | 124 | DISTRIBUTION_PATCHES_append_powerpc = " \ |
125 | patches/icedtea-jdk-nio-use-host-cc.patch \ | ||
126 | patches/icedtea-jdk-ppc64-jvm-cfg.patch \ | 125 | patches/icedtea-jdk-ppc64-jvm-cfg.patch \ |
127 | patches/icedtea-jdk-powerpc-atomic64.patch \ | 126 | patches/icedtea-jdk-powerpc-atomic64.patch \ |
128 | " | 127 | " |
129 | DISTRIBUTION_PATCHES_append_powerpc64 = " \ | 128 | DISTRIBUTION_PATCHES_append_powerpc64 = " \ |
130 | patches/icedtea-jdk-nio-use-host-cc.patch \ | ||
131 | patches/icedtea-jdk-ppc64-jvm-cfg.patch \ | 129 | patches/icedtea-jdk-ppc64-jvm-cfg.patch \ |
132 | " | 130 | " |
133 | export DISTRIBUTION_PATCHES | 131 | export DISTRIBUTION_PATCHES |