aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-08-20 16:32:32 +0100
committerRichard Leitner <richard.leitner@skidata.com>2018-08-21 08:14:04 +0200
commit8e07641d14fb361b0d6d5ed5655e921a902f1109 (patch)
treebd91af20688d0ed99b568cc98f7b0a3cecefd90f
parent9d85ff7259d0352c5ed84dc56f8a29119fdedafe (diff)
downloadmeta-java-8e07641d14fb361b0d6d5ed5655e921a902f1109.tar.gz
meta-java-8e07641d14fb361b0d6d5ed5655e921a902f1109.tar.bz2
meta-java-8e07641d14fb361b0d6d5ed5655e921a902f1109.zip
openjdk-8: always apply some patches
As a simplification for the upcoming aarch32 port. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <dev@g0hl1n.net>
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-release-172b11-common.inc3
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index e6f7933..6a01046 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -7,8 +7,6 @@ DEPENDS = "\
ca-certificates-native openssl-native coreutils-native \
"
-SRC_URI_append += "file://handle_extra_output.patch"
-
PACKAGECONFIG ??= "gif jpeg png zlib"
PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
PACKAGECONFIG[cups] = "--with-cups,,cups"
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc
index 4bcecef..8e94a4f 100644
--- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc
@@ -18,6 +18,8 @@ PATCHES_URI = "\
file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \
file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \
${HOTSPOT_UB_PATCH} \
+ ${LIBPNG_NEON_PATCH} \
+ file://handle_extra_output.patch \
"
HOTSPOT_UB_PATCH = "\
file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \
@@ -43,7 +45,6 @@ PATCHES_URI_append_class-target = "\
file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \
file://openjdk8-fix-adlc-flags.patch;striplevel=0 \
file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \
- ${LIBPNG_NEON_PATCH} \
"
PATCHES_URI_append_libc-musl = "\
file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \