diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2018-06-14 17:44:57 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-06-15 12:06:25 +0200 |
commit | 52fb41cec7d5125bb11c718705158696ffef11f8 (patch) | |
tree | aadcaeaab81c6a335060c8730fea0ce80b91ee1f /recipes-core | |
parent | 4d5c4a654dc45e75b99f5dcfb43352e9683db583 (diff) | |
download | meta-java-52fb41cec7d5125bb11c718705158696ffef11f8.tar.gz |
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')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-16xbyy.inc | 1 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/hotspot_fix_gcc8x_build.patch | 21 |
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 = "\ | |||
16 | file://0008-jdk-use-correct-include-for-signal.patch \ | 16 | file://0008-jdk-use-correct-include-for-signal.patch \ |
17 | file://0009-jdk-disable-backtrace-musl-build-fix.patch \ | 17 | file://0009-jdk-disable-backtrace-musl-build-fix.patch \ |
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://hotspot_fix_gcc8x_build.patch \ | ||
19 | " | 20 | " |
20 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | 21 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch |
21 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | 22 | # 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 @@ | |||
1 | From: Richard Leitner <richard.leitner@skidata.com> | ||
2 | Date: Thu, 14 Jun 2018 23:42:11 +0200 | ||
3 | Subject: [PATCH] openjdk-8: hotspot: fix gcc8 compilation | ||
4 | |||
5 | As oe-core/yocto-project master migrated to gcc8.x we need to support this. | ||
6 | Therefore disable following gcc warnings/errors which caused the build to fail: | ||
7 | + stringop-overflow | ||
8 | + return-type | ||
9 | --- | ||
10 | |||
11 | --- a/hotspot/make/linux/makefiles/gcc.make | ||
12 | +++ b/hotspot/make/linux/makefiles/gcc.make | ||
13 | @@ -197,7 +197,7 @@ | ||
14 | endif | ||
15 | |||
16 | # Compiler warnings are treated as errors | ||
17 | -WARNINGS_ARE_ERRORS = -Werror | ||
18 | +WARNINGS_ARE_ERRORS = -Werror -Wno-stringop-overflow -Wno-error=return-type | ||
19 | |||
20 | ifeq ($(USE_CLANG), true) | ||
21 | # However we need to clean the code up before we can unrestrictedly enable this option with Clang | ||