From b71a9866abfd5292650ef0afc5ecb9ab5e29b887 Mon Sep 17 00:00:00 2001 From: AJ Bagwell Date: Mon, 9 Aug 2021 14:09:37 +0100 Subject: all: run convert-overrides (0.9.3) script to convert to new override format Signed-off-by: AJ Bagwell Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-native.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'recipes-core/openjdk/openjdk-8-native.inc') diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 3282257..c02e183 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -17,7 +17,7 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" -EXTRA_OECONF_append = "\ +EXTRA_OECONF:append = "\ --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ \ --with-tools-dir=${STAGING_DIR_NATIVE} \ @@ -36,32 +36,32 @@ require openjdk-8-common.inc inherit native -CFLAGS_append = " ${@jdk_cpp_options(d)}" -CPPFLAGS_append = "${@jdk_cpp_options(d)}" -CXXFLAGS_append = " ${@jdk_cpp_options(d)}" +CFLAGS:append = " ${@jdk_cpp_options(d)}" +CPPFLAGS:append = "${@jdk_cpp_options(d)}" +CXXFLAGS:append = " ${@jdk_cpp_options(d)}" export MAKE_VERBOSE = "y" export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" -EXTRA_OEMAKE_append = ' \ +EXTRA_OEMAKE:append = ' \ ${@jdk_make_options(d)} \ MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ QUIETLY= \ images \ ' -do_configure_prepend() { +do_configure:prepend() { export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" export ${@jdk_environment_options(d)} unset CC CXX } -do_compile_prepend() { +do_compile:prepend() { export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" } -do_compile_append() { +do_compile:append() { set -x mkdir -p ${B}/certs for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") @@ -90,4 +90,4 @@ do_install() { } # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" -- cgit v1.2.3-54-g00ecf