From 3737e0d040dd89737ef4d3a7c45f71c4ff9ad2a8 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 13 Aug 2018 11:09:34 +0100 Subject: Revert "openjdk-8: fix build for gcc8.x" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 52fb41cec7d5125bb11c718705158696ffef11f8. The change being reverted has two problems: - it still doesn't produce working binaries - compilation on pre-gcc v7 compilers fails (which is relevant for compiling openjdk-8-native, as that uses the build machine's gcc, not yocto's gcc): | At global scope: | cc1plus: error: unrecognized command line option ‘-Wno-stringop-overflow’ [-Werror] | cc1plus: all warnings being treated as errors We now use a different approach to address the issues than that patch, and it is thusly not needed anymore. We fully support gcc < 7 again. Signed-off-by: André Draszik Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-release-16xbyy.inc | 1 - .../patches-openjdk-8/hotspot_fix_gcc8x_build.patch | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch diff --git a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc index bd440c6..8b30c37 100644 --- a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc +++ b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc @@ -16,7 +16,6 @@ PATCHES_URI = "\ file://0008-jdk-use-correct-include-for-signal.patch \ file://0009-jdk-disable-backtrace-musl-build-fix.patch \ file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ - file://hotspot_fix_gcc8x_build.patch \ file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ " # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch b/recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch deleted file mode 100644 index 1a406f2..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Richard Leitner -Date: Thu, 14 Jun 2018 23:42:11 +0200 -Subject: [PATCH] openjdk-8: hotspot: fix gcc8 compilation - -As oe-core/yocto-project master migrated to gcc8.x we need to support this. -Therefore disable following gcc warnings/errors which caused the build to fail: - + stringop-overflow - + return-type ---- - ---- a/hotspot/make/linux/makefiles/gcc.make -+++ b/hotspot/make/linux/makefiles/gcc.make -@@ -197,7 +197,7 @@ - endif - - # Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -+WARNINGS_ARE_ERRORS = -Werror -Wno-stringop-overflow -Wno-error=return-type - - ifeq ($(USE_CLANG), true) - # However we need to clean the code up before we can unrestrictedly enable this option with Clang -- cgit v1.2.3-54-g00ecf