1 files changed, 37 insertions, 35 deletions

diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index b0b9419..d6f8fd7 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -16,24 +16,28 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
 PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
 
 OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
-CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
+CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
 
 # Disable dead store elimination and set C++ standard to C++98.
 # There are dead stores in the JVM that would be pretty hard to
 # remove, so disable the optimisation in the compiler.
-CFLAGS_append = " -fno-tree-dse"
-CXXFLAGS_append = " -fno-tree-dse"
-CXX_append = " -std=gnu++98"
+CFLAGS:append = " -std=gnu++98 -fno-tree-dse -fno-tree-vectorize"
+CXXFLAGS:append = " -std=gnu++98 -fno-tree-dse"
 
 # WORKAROUND: ignore errors from new compilers
-CFLAGS_append = " -Wno-error=stringop-overflow -Wno-error=return-type"
+CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type"
+
+# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9"
+HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}"
+CFLAGS:append = " ${@oe.utils.less_or_equal('HOST_COMPILER_MAJOR', '8', '', ' -Wno-error=format-overflow', d)}"
 
 # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources
-CFLAGS_append = " -fcommon"
+CFLAGS:append = " -fcommon"
 
-inherit native java autotools pkgconfig
+inherit java autotools pkgconfig
 inherit openjdk-build-helper
 inherit python3native
+inherit native
 
 JAVA_HOME[unexport] = "1"
 
@@ -61,43 +65,41 @@ B = "${S}/build"
 # openjdk looks in /usr/include and /usr/lib for freetype by default.
 export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
 export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
+export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
 
 # libfreetype.so.6 is copied from STAGING_LIBDIR
 # which is already stripped.
-INSANE_SKIP_${PN} = "already-stripped"
+INSANE_SKIP:${PN} = "already-stripped"
 
 EXTRA_OECONF = "\
-        --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
-        \
-        --disable-tests \
-        --disable-hotspot-tests \
-        --disable-langtools-tests \
-        --disable-jdk-tests \
-        --disable-pulse-java \
-        --disable-docs \
-        --disable-nss \
-        --disable-system-lcms \
-        --disable-system-gtk \
-        \
-        --with-jdk-home=${WORKDIR}/fake-jdk \
-        --with-javac=${STAGING_BINDIR_NATIVE}/javac \
-        --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \
-        \
-        --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE} \
-        --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE} \
-        --with-corba-src-zip=${DL_DIR}/${CORBA_FILE} \
-        --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE} \
-        --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \
-        --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \
-        --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \
-        ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
-  "
+    --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
+    --disable-tests \
+    --disable-hotspot-tests \
+    --disable-langtools-tests \
+    --disable-jdk-tests \
+    --disable-pulse-java \
+    --disable-docs \
+    --disable-nss \
+    --disable-system-lcms \
+    --disable-system-gtk \
+    --with-jdk-home=${WORKDIR}/fake-jdk \
+    --with-javac=${STAGING_BINDIR_NATIVE}/javac \
+    --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \
+    --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE_DOWNLOAD} \
+    --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE_DOWNLOAD} \
+    --with-corba-src-zip=${DL_DIR}/${CORBA_FILE_DOWNLOAD} \
+    --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE_DOWNLOAD} \
+    --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE_DOWNLOAD} \
+    --with-jdk-src-zip=${DL_DIR}/${JDK_FILE_DOWNLOAD} \
+    --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE_DOWNLOAD} \
+    ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
+"
 
 JDK_DIR = "icedtea7-native"
 
 JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}"
 
-do_configure_prepend() {
+do_configure:prepend() {
         arch="${@openjdk_build_helper_get_icedtea_arch(d)}"
         libarch="${@openjdk_build_helper_get_icedtea_arch(d)}"
 
@@ -128,7 +130,7 @@ do_configure_prepend() {
 
 POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}"
 
-do_configure_append() {
+do_configure:append() {
         oe_runmake patch-fsg
 
         for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ;