diff options
author | Evgeny Sagatov <sagatov@ya.ru> | 2024-02-02 16:01:24 +0300 |
---|---|---|
committer | Tim Orling <TicoTimo@gmail.com> | 2024-02-03 15:54:28 -0800 |
commit | 8c0c9f13cb89008f080fded0ca435f388e97bd7b (patch) | |
tree | f3946862376b997cc8d4d073383f69daf4670aa8 | |
parent | 4256a9e5b0b6ff687f3656f9659285c2b37e8aa2 (diff) | |
download | meta-java-8c0c9f13cb89008f080fded0ca435f388e97bd7b.tar.gz |
Add compatability with GCC 12.x
Fixes build for kas 4.2 and Yocto Project 4.3.2
Signed-off-by: Evgeny Sagatov <sagatov@ya.ru>
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 5 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 3 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 0f317bb..d6f8fd7 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -21,9 +21,8 @@ CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=t | |||
21 | # Disable dead store elimination and set C++ standard to C++98. | 21 | # Disable dead store elimination and set C++ standard to C++98. |
22 | # There are dead stores in the JVM that would be pretty hard to | 22 | # There are dead stores in the JVM that would be pretty hard to |
23 | # remove, so disable the optimisation in the compiler. | 23 | # remove, so disable the optimisation in the compiler. |
24 | CFLAGS:append = " -fno-tree-dse" | 24 | CFLAGS:append = " -std=gnu++98 -fno-tree-dse -fno-tree-vectorize" |
25 | CXXFLAGS:append = " -fno-tree-dse" | 25 | CXXFLAGS:append = " -std=gnu++98 -fno-tree-dse" |
26 | CXX:append = " -std=gnu++98" | ||
27 | 26 | ||
28 | # WORKAROUND: ignore errors from new compilers | 27 | # WORKAROUND: ignore errors from new compilers |
29 | CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type" | 28 | CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type" |
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 0435233..cba1ea6 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -459,3 +459,6 @@ ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" | |||
459 | ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" | 459 | ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" |
460 | 460 | ||
461 | ALTERNATIVE_PRIORITY = "50" | 461 | ALTERNATIVE_PRIORITY = "50" |
462 | |||
463 | # canon-prefix-map doesn't exist in gcc 12.x | ||
464 | DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" | ||
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 16e3816..82bf31e 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -194,3 +194,6 @@ BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}" | |||
194 | # flags for -cross | 194 | # flags for -cross |
195 | TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" | 195 | TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" |
196 | TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" | 196 | TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" |
197 | |||
198 | # canon-prefix-map doesn't exist in gcc 12.x | ||
199 | DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" | ||