aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2018-06-14 17:44:57 +0200
committerRichard Leitner <richard.leitner@skidata.com>2018-06-15 12:06:25 +0200
commit52fb41cec7d5125bb11c718705158696ffef11f8 (patch)
treeaadcaeaab81c6a335060c8730fea0ce80b91ee1f /recipes-core/openjdk
parent4d5c4a654dc45e75b99f5dcfb43352e9683db583 (diff)
downloadmeta-java-52fb41cec7d5125bb11c718705158696ffef11f8.tar.gz
meta-java-52fb41cec7d5125bb11c718705158696ffef11f8.tar.bz2
meta-java-52fb41cec7d5125bb11c718705158696ffef11f8.zip
openjdk-8: fix build for gcc8.x
Currently oe-core/YoctoProject migrated to gcc8.x. This update broke our openjdk-8 and openjre-8 build. This patch avoids this problem by disabling the problematic gcc warnings and errors. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-8-release-16xbyy.inc1
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc
index bd4a349..7ca0997 100644
--- a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc
+++ b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc
@@ -16,6 +16,7 @@ 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 \
"
# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html
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
new file mode 100644
index 0000000..1a406f2
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch
@@ -0,0 +1,21 @@
+From: Richard Leitner <richard.leitner@skidata.com>
+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