summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/icedtea7-native.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index f53715f..331b7a4 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -16,25 +16,25 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
16PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" 16PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
17 17
18OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" 18OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
19CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" 19CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
20 20
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.
24CFLAGS_append = " -fno-tree-dse" 24CFLAGS:append = " -fno-tree-dse"
25CXXFLAGS_append = " -fno-tree-dse" 25CXXFLAGS:append = " -fno-tree-dse"
26CXX_append = " -std=gnu++98" 26CXX:append = " -std=gnu++98"
27 27
28# WORKAROUND: ignore errors from new compilers 28# WORKAROUND: ignore errors from new compilers
29CFLAGS_append = " -Wno-error=stringop-overflow -Wno-error=return-type" 29CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type"
30 30
31# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9" 31# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9"
32HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}" 32HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}"
33# if compiler version 9 detected, add more CFLAGS 33# if compiler version 9 detected, add more CFLAGS
34CFLAGS_append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}" 34CFLAGS:append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}"
35 35
36# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources 36# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources
37CFLAGS_append = " -fcommon" 37CFLAGS:append = " -fcommon"
38 38
39inherit java autotools pkgconfig 39inherit java autotools pkgconfig
40inherit openjdk-build-helper 40inherit openjdk-build-helper
@@ -71,7 +71,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
71 71
72# libfreetype.so.6 is copied from STAGING_LIBDIR 72# libfreetype.so.6 is copied from STAGING_LIBDIR
73# which is already stripped. 73# which is already stripped.
74INSANE_SKIP_${PN} = "already-stripped" 74INSANE_SKIP:${PN} = "already-stripped"
75 75
76EXTRA_OECONF = "\ 76EXTRA_OECONF = "\
77 --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 77 --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
@@ -101,7 +101,7 @@ JDK_DIR = "icedtea7-native"
101 101
102JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" 102JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}"
103 103
104do_configure_prepend() { 104do_configure:prepend() {
105 arch="${@openjdk_build_helper_get_icedtea_arch(d)}" 105 arch="${@openjdk_build_helper_get_icedtea_arch(d)}"
106 libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" 106 libarch="${@openjdk_build_helper_get_icedtea_arch(d)}"
107 107
@@ -132,7 +132,7 @@ do_configure_prepend() {
132 132
133POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" 133POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}"
134 134
135do_configure_append() { 135do_configure:append() {
136 oe_runmake patch-fsg 136 oe_runmake patch-fsg
137 137
138 for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; 138 for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ;