diff options
author | AJ Bagwell <anthony.bagwell@hivehome.com> | 2021-08-09 14:09:37 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2021-08-11 07:19:27 +0200 |
commit | b71a9866abfd5292650ef0afc5ecb9ab5e29b887 (patch) | |
tree | 8e7cfd6025f06b4138e2f5fbca61dce7d3a13bac /recipes-core/openjdk/openjdk-8-cross.inc | |
parent | 984f25b6deb5fe4acf82d51c04b2c1392a542723 (diff) | |
download | meta-java-b71a9866abfd5292650ef0afc5ecb9ab5e29b887.tar.gz |
all: run convert-overrides (0.9.3) script to convert to new override format
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 25d971f..ff682f1 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -47,13 +47,13 @@ require openjdk-8-common.inc | |||
47 | 47 | ||
48 | JAVA_HOME[unexport] = "1" | 48 | JAVA_HOME[unexport] = "1" |
49 | 49 | ||
50 | SRC_URI_append = "\ | 50 | SRC_URI:append = "\ |
51 | file://jvm.cfg \ | 51 | file://jvm.cfg \ |
52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ | 52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ |
53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ | 53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ |
54 | " | 54 | " |
55 | 55 | ||
56 | EXTRA_OECONF_append = "\ | 56 | EXTRA_OECONF:append = "\ |
57 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 57 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
58 | \ | 58 | \ |
59 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 59 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
@@ -73,16 +73,16 @@ EXTRA_OECONF_append = "\ | |||
73 | ${@jdk_configure_options(d)} \ | 73 | ${@jdk_configure_options(d)} \ |
74 | " | 74 | " |
75 | 75 | ||
76 | do_configure_prepend() { | 76 | do_configure:prepend() { |
77 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 77 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
78 | export ${@jdk_environment_options(d)} | 78 | export ${@jdk_environment_options(d)} |
79 | } | 79 | } |
80 | 80 | ||
81 | do_configure_append() { | 81 | do_configure:append() { |
82 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk | 82 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk |
83 | } | 83 | } |
84 | 84 | ||
85 | do_install_append() { | 85 | do_install:append() { |
86 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then | 86 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then |
87 | if [ -d ${D}${JDK_HOME} ] ; then | 87 | if [ -d ${D}${JDK_HOME} ] ; then |
88 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ | 88 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ |
@@ -104,7 +104,7 @@ do_install[vardepsexclude] += "BB_NUMBER_THREADS" | |||
104 | export MAKE_VERBOSE = "y" | 104 | export MAKE_VERBOSE = "y" |
105 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" | 105 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" |
106 | 106 | ||
107 | EXTRA_OEMAKE_append = '\ | 107 | EXTRA_OEMAKE:append = '\ |
108 | ${@jdk_make_options(d)} \ | 108 | ${@jdk_make_options(d)} \ |
109 | ALT_SDT_H="${STAGING_INCDIR}" \ | 109 | ALT_SDT_H="${STAGING_INCDIR}" \ |
110 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ | 110 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ |
@@ -132,4 +132,4 @@ PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" | |||
132 | 132 | ||
133 | # FIXME libjsig.so is a symlink to a .so but this one is valid | 133 | # FIXME libjsig.so is a symlink to a .so but this one is valid |
134 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped | 134 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped |
135 | INSANE_SKIP_${PN} = "dev-so already-stripped" | 135 | INSANE_SKIP:${PN} = "dev-so already-stripped" |