From 8e07641d14fb361b0d6d5ed5655e921a902f1109 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 20 Aug 2018 16:32:32 +0100 Subject: openjdk-8: always apply some patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As a simplification for the upcoming aarch32 port. Signed-off-by: André Draszik Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-native.inc | 2 -- 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 = "\ 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 \ -- cgit v1.2.3-54-g00ecf