summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-cross.inc
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:30:57 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-05 13:55:35 +0200
commit895de9d265b6167b539d4d1ed213d5c2f7e56956 (patch)
tree7094e7b80a45b37d65f886cfe56720cad32bd61c /recipes-core/openjdk/openjdk-8-cross.inc
parent1a5e8d816de76f7ebcdc29e755448a4836190249 (diff)
downloadmeta-java-895de9d265b6167b539d4d1ed213d5c2f7e56956.tar.gz
openjdk-8: rework do_patch (pt 2 - use bitbake variable overrides)
This currently uses a hand-crafted solution to distinguish between common, native-only and and target-only patches. That is a bit hard to follow as patches are being applied in strange order, and is also non-standard. Instead, we can just use bitbake variable overrides. This makes it much easier to work with this recipe, as: * it is clear in which order patches are going to be applied by looking at the recipe * it is clear which patches are meant to be common, for build, or target * old patches that are still lying around in WORKDIR (e.g. because rm_work is not enabled), but that have been removed from SRC_URI are no longer incorrectly applied * if patches fail to apply, we know exactly which patch has failed * we can use PATCHTOOL = without any ill effects Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc14
1 files changed, 0 insertions, 14 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 65e3a98..3973fcf 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -1,20 +1,6 @@
1JDK_HOME = "${libdir_jvm}/openjdk-8" 1JDK_HOME = "${libdir_jvm}/openjdk-8"
2JRE_HOME = "${libdir_jvm}/openjre-8" 2JRE_HOME = "${libdir_jvm}/openjre-8"
3 3
4# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
5# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html
6# by Roman Kennke (rkennke at redhat.com)
7PATCHES_URI_append = "\
8 file://openjdk8-restrict-to-staging-dir.patch;apply=no \
9 file://openjdk8-fix-shark-build.patch;apply=no \
10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \
11 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
12 file://openjdk8-fix-adlc-flags.patch;apply=no \
13 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
14 file://openjdk8-add-missing-linker-flags.patch;apply=no \
15 file://openjdk8-fix-libpng-neon-build.patch;apply=no \
16"
17
18DEPENDS = "\ 4DEPENDS = "\
19 openjdk-8-native zip-native ant-native libxslt \ 5 openjdk-8-native zip-native ant-native libxslt \
20 jpeg libpng krb5 libffi fontconfig freetype \ 6 jpeg libpng krb5 libffi fontconfig freetype \