diff options
author | André Draszik <andre.draszik@jci.com> | 2018-08-20 16:32:32 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-08-21 08:14:04 +0200 |
commit | 8e07641d14fb361b0d6d5ed5655e921a902f1109 (patch) | |
tree | bd91af20688d0ed99b568cc98f7b0a3cecefd90f | |
parent | 9d85ff7259d0352c5ed84dc56f8a29119fdedafe (diff) | |
download | meta-java-8e07641d14fb361b0d6d5ed5655e921a902f1109.tar.gz |
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.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-172b11-common.inc | 3 |
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 = "\ | |||
7 | ca-certificates-native openssl-native coreutils-native \ | 7 | ca-certificates-native openssl-native coreutils-native \ |
8 | " | 8 | " |
9 | 9 | ||
10 | SRC_URI_append += "file://handle_extra_output.patch" | ||
11 | |||
12 | PACKAGECONFIG ??= "gif jpeg png zlib" | 10 | PACKAGECONFIG ??= "gif jpeg png zlib" |
13 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" | 11 | PACKAGECONFIG[x11] = "--with-x,,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" |
14 | PACKAGECONFIG[cups] = "--with-cups,,cups" | 12 | 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 = "\ | |||
18 | file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ | 18 | file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ |
19 | file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ | 19 | file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ |
20 | ${HOTSPOT_UB_PATCH} \ | 20 | ${HOTSPOT_UB_PATCH} \ |
21 | ${LIBPNG_NEON_PATCH} \ | ||
22 | file://handle_extra_output.patch \ | ||
21 | " | 23 | " |
22 | HOTSPOT_UB_PATCH = "\ | 24 | HOTSPOT_UB_PATCH = "\ |
23 | file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \ | 25 | file://0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch \ |
@@ -43,7 +45,6 @@ PATCHES_URI_append_class-target = "\ | |||
43 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ | 45 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ |
44 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ | 46 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ |
45 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ | 47 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ |
46 | ${LIBPNG_NEON_PATCH} \ | ||
47 | " | 48 | " |
48 | PATCHES_URI_append_libc-musl = "\ | 49 | PATCHES_URI_append_libc-musl = "\ |
49 | file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ | 50 | file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ |