3 files changed, 87 insertions, 53 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"
+CFLAGS:append = " -std=gnu++98 -fno-tree-dse -fno-tree-vectorize"
-CXXFLAGS_append = " -fno-tree-dse"
+CXXFLAGS:append = " -std=gnu++98 -fno-tree-dse"
-CXX_append = " -std=gnu++98"
 # 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)} \
+    --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
-        \
+    --disable-tests \
-        --disable-tests \
+    --disable-hotspot-tests \
-        --disable-hotspot-tests \
+    --disable-langtools-tests \
-        --disable-langtools-tests \
+    --disable-jdk-tests \
-        --disable-jdk-tests \
+    --disable-pulse-java \
-        --disable-pulse-java \
+    --disable-docs \
-        --disable-docs \
+    --disable-nss \
-        --disable-nss \
+    --disable-system-lcms \
-        --disable-system-lcms \
+    --disable-system-gtk \
-        --disable-system-gtk \
+    --with-jdk-home=${WORKDIR}/fake-jdk \
-        \
+    --with-javac=${STAGING_BINDIR_NATIVE}/javac \
-        --with-jdk-home=${WORKDIR}/fake-jdk \
+    --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \
-        --with-javac=${STAGING_BINDIR_NATIVE}/javac \
+    --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE_DOWNLOAD} \
-        --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \
+    --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE_DOWNLOAD} \
-        \
+    --with-corba-src-zip=${DL_DIR}/${CORBA_FILE_DOWNLOAD} \
-        --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE} \
+    --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE_DOWNLOAD} \
-        --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE} \
+    --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE_DOWNLOAD} \
-        --with-corba-src-zip=${DL_DIR}/${CORBA_FILE} \
+    --with-jdk-src-zip=${DL_DIR}/${JDK_FILE_DOWNLOAD} \
-        --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE} \
+    --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE_DOWNLOAD} \
-        --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \
+    ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
-        --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" \
-  "
 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 ;
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch
new file mode 100644
index 0000000..1c7a585
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch
@@ -0,0 +1,22 @@
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+@@ -35,7 +35,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+ 
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+@@ -43,7 +43,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+#include <linux/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 9816c0c..16bf592 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:"
 # Force arm mode for now
-ARM_INSTRUCTION_SET_armv4t = "ARM"
+ARM_INSTRUCTION_SET:armv4t = "ARM"
 ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced"
@@ -13,50 +13,58 @@ ICEDTEA_PREFIX = "icedtea7-forest-2.1"
 ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}"
 OPENJDK_CHANGESET = "22cc03983e20"
-OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2"
+OPENJDK_FILE_UPSTREAM = "${OPENJDK_CHANGESET}.tar.bz2"
-OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false"
+OPENJDK_FILE_DOWNLOAD = "openjdk-${OPENJDK_CHANGESET}.tar.bz2"
+OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE_UPSTREAM};name=openjdk;unpack=false;downloadfilename=${OPENJDK_FILE_DOWNLOAD}"
 SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb"
 SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e"
 HOTSPOT_CHANGESET = "8b7c4c5f6ba9"
-HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz"
+HOTSPOT_FILE_UPSTREAM = "${HOTSPOT_CHANGESET}.tar.gz"
-HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
+HOTSPOT_FILE_DOWNLOAD = "hotspot-${HOTSPOT_CHANGESET}.tar.gz"
+HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE_UPSTREAM};name=hotspot;unpack=false;downloadfilename=${HOTSPOT_FILE_DOWNLOAD}"
 SRC_URI[hotspot.md5sum] = "cb45a8f19d77acc1f4f48e75e36a27fe"
 SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2"
 CORBA_CHANGESET = "5617f6c5cc94"
-CORBA_FILE = "${CORBA_CHANGESET}.tar.gz"
+CORBA_FILE_UPSTREAM = "${CORBA_CHANGESET}.tar.gz"
-CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false"
+CORBA_FILE_DOWNLOAD = "corba-${CORBA_CHANGESET}.tar.gz"
+CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE_UPSTREAM};name=corba;unpack=false;downloadfilename=${CORBA_FILE_DOWNLOAD}"
 SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251"
 SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3"
 JAXP_CHANGESET = "7a8825b15df6"
-JAXP_FILE = "${JAXP_CHANGESET}.tar.gz"
+JAXP_FILE_UPSTREAM = "${JAXP_CHANGESET}.tar.gz"
-JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false"
+JAXP_FILE_DOWNLOAD = "jaxp-${JAXP_CHANGESET}.tar.gz"
+JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE_UPSTREAM};name=jaxp;unpack=false;downloadfilename=${JAXP_FILE_DOWNLOAD}"
 SRC_URI[jaxp.md5sum] = "a0982b6df79739127871e355a40ca5a6"
 SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2"
 JAXWS_CHANGESET = "7edfbfe974f2"
-JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz"
+JAXWS_FILE_UPSTREAM = "${JAXWS_CHANGESET}.tar.gz"
-JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false"
+JAXWS_FILE_DOWNLOAD = "jaxws-${JAXWS_CHANGESET}.tar.gz"
+JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE_UPSTREAM};name=jaxws;unpack=false;downloadfilename=${JAXWS_FILE_DOWNLOAD}"
 SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac"
 SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa"
 JDK_CHANGESET = "d5ddeffc4651"
-JDK_FILE = "${JDK_CHANGESET}.tar.gz"
+JDK_FILE_UPSTREAM = "${JDK_CHANGESET}.tar.gz"
-JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
+JDK_FILE_DOWNLOAD = "jdk-${JDK_CHANGESET}.tar.gz"
+JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE_UPSTREAM};name=jdk;unpack=false;downloadfilename=${JDK_FILE_DOWNLOAD}"
 SRC_URI[jdk.md5sum] = "27c28d6be213df818490e69f12efe475"
 SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98"
 LANGTOOLS_CHANGESET = "b534c4c6cd9b"
-LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz"
+LANGTOOLS_FILE_UPSTREAM = "${LANGTOOLS_CHANGESET}.tar.gz"
-LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
+LANGTOOLS_FILE_DOWNLOAD = "langtools-${LANGTOOLS_CHANGESET}.tar.gz"
+LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE_UPSTREAM};name=langtools;unpack=false;downloadfilename=${LANGTOOLS_FILE_DOWNLOAD}"
 SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53"
 SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c"
 CACAO_VERSION = "a567bcb7f589"
-CACAO_FILE = "${CACAO_VERSION}.tar.gz"
+CACAO_FILE_UPSTREAM = "${CACAO_VERSION}.tar.gz"
-CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false"
+CACAO_FILE_DOWNLOAD = "cacao-${CACAO_VERSION}.tar.gz"
+CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE_UPSTREAM};name=cacao;unpack=false;downloadfilename=${CACAO_FILE_DOWNLOAD}"
 SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
 SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
@@ -93,6 +101,7 @@ OPENJDK_PATCHES = " \
        file://icedtea-jdk-unzip.patch;apply=no \
        file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \
        file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \
+        file://icedtea-jdk-replace-sys-sysctl.patch;apply=no \
        "
 OPENJDK_HEADLESS_PATCHES = " \
@@ -118,9 +127,10 @@ export DISTRIBUTION_PATCHES = " \
        patches/icedtea-jdk-unzip.patch \
        patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \
        patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \
+        patches/icedtea-jdk-replace-sys-sysctl.patch \
        ${CLEAN_X11_DISTRIBUTION_PATCH} \
        "
 # readdir_r was deprecated in glibc-2.24. Ignore the error for now
 # NOTE: When updating the recipe, please check if this is still needed
-CFLAGS_append = " -Wno-error=deprecated-declarations"
+CFLAGS:append = " -Wno-error=deprecated-declarations"