1 files changed, 28 insertions, 12 deletions

diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index c78bb2a..82bf31e 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -26,8 +26,9 @@ SRC_URI = "\
     ${PATCHES_URI} \
 "
 
-do_configure_prepend () {
+do_configure:prepend () {
     export TOPDIR=${S}
+    sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac
 }
 
 do_unpack_extract_submodules () {
@@ -42,6 +43,21 @@ do_unpack_extract_submodules () {
     tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g"
 }
 
+do_patch:prepend() {
+    # use do_patch:prepend syntax and not pre/postfuncs to
+    # call do_unpack_extract_submodules
+    # *) the archiver.bbclass modifies WORKDIR, S, B,...
+    #    and those modifications are lost otherwise,
+    #    which leads to build failures in do_unpack_and_patch -> do_patch
+    func = 'do_unpack_extract_submodules'
+    bb.build.exec_func(func, d)
+
+    # delete X11 wrappers if x11 is not part of PACKAGECONFIG
+    if bb.utils.contains('PACKAGECONFIG', 'x11', False, True, d):
+       func_delete = 'do_unpack_delete_X11_wrappers'
+       bb.build.exec_func(func_delete, d)
+}
+
 do_unpack_delete_X11_wrappers() {
     find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete
 }
@@ -96,10 +112,7 @@ def package_config_option_cleanup(d):
     if not option_headless and not with_cups:
         option_headless = True
 
-    if not option_soundless and not with_alsa:
-        option_soundless = True
-
-    if not option_soundless and not with_pulseaudio:
+    if not option_soundless and not with_pulseaudio and not with_alsa:
         option_soundless = True
 
     options = {'make': [], 'cpp': [], 'env': [], 'configure': ["--disable-ccache"] }
@@ -155,8 +168,8 @@ def jdk_configure_options(d):
     options = package_config_option_cleanup(d)
     return options[3]
 
-do_unpack[postfuncs] += "do_unpack_extract_submodules"
-do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}"
+#do_unpack[postfuncs] += "do_unpack_extract_submodules"
+#do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}"
 
 export DEBUG_BINARIES = "true"
 
@@ -164,7 +177,7 @@ ALTERNATIVE_PRIORITY = "50"
 
 OPENJDK_UPDATE_VERSION = "${PV}"
 OPENJDK_BUILD_NUMBER = "ga"
-EXTRA_OECONF_append = "\
+EXTRA_OECONF:append = "\
         --with-build-number=${OPENJDK_BUILD_NUMBER} \
         --with-update-version=${OPENJDK_UPDATE_VERSION} \
 "
@@ -176,8 +189,11 @@ EXTRA_OECONF_append = "\
 GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon"
 
 # flags for -native, and for bits that need a host-tool during -cross
-BUILD_CFLAGS_append = " ${GLOBAL_FLAGS}"
-BUILD_CXXFLAGS_append = " ${GLOBAL_FLAGS}"
+BUILD_CFLAGS:append = " ${GLOBAL_FLAGS}"
+BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
 # flags for -cross
-TARGET_CFLAGS_append = " ${GLOBAL_FLAGS}"
-TARGET_CXXFLAGS_append = " ${GLOBAL_FLAGS}"
+TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}"
+TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
+
+# canon-prefix-map doesn't exist in gcc 12.x
+DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"