diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-common.inc')
| -rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 70585a6..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,8 +43,8 @@ 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 +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, @@ -176,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} \ " @@ -188,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" |