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-common.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-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 7d45585..16e3816 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -26,7 +26,7 @@ SRC_URI = "\ | |||
26 | ${PATCHES_URI} \ | 26 | ${PATCHES_URI} \ |
27 | " | 27 | " |
28 | 28 | ||
29 | do_configure_prepend () { | 29 | do_configure:prepend () { |
30 | export TOPDIR=${S} | 30 | export TOPDIR=${S} |
31 | sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac | 31 | sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac |
32 | } | 32 | } |
@@ -43,8 +43,8 @@ do_unpack_extract_submodules () { | |||
43 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" | 43 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" |
44 | } | 44 | } |
45 | 45 | ||
46 | do_patch_prepend() { | 46 | do_patch:prepend() { |
47 | # use do_patch_prepend syntax and not pre/postfuncs to | 47 | # use do_patch:prepend syntax and not pre/postfuncs to |
48 | # call do_unpack_extract_submodules | 48 | # call do_unpack_extract_submodules |
49 | # *) the archiver.bbclass modifies WORKDIR, S, B,... | 49 | # *) the archiver.bbclass modifies WORKDIR, S, B,... |
50 | # and those modifications are lost otherwise, | 50 | # and those modifications are lost otherwise, |
@@ -177,7 +177,7 @@ ALTERNATIVE_PRIORITY = "50" | |||
177 | 177 | ||
178 | OPENJDK_UPDATE_VERSION = "${PV}" | 178 | OPENJDK_UPDATE_VERSION = "${PV}" |
179 | OPENJDK_BUILD_NUMBER = "ga" | 179 | OPENJDK_BUILD_NUMBER = "ga" |
180 | EXTRA_OECONF_append = "\ | 180 | EXTRA_OECONF:append = "\ |
181 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 181 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
182 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 182 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
183 | " | 183 | " |
@@ -189,8 +189,8 @@ EXTRA_OECONF_append = "\ | |||
189 | GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" | 189 | GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" |
190 | 190 | ||
191 | # flags for -native, and for bits that need a host-tool during -cross | 191 | # flags for -native, and for bits that need a host-tool during -cross |
192 | BUILD_CFLAGS_append = " ${GLOBAL_FLAGS}" | 192 | BUILD_CFLAGS:append = " ${GLOBAL_FLAGS}" |
193 | BUILD_CXXFLAGS_append = " ${GLOBAL_FLAGS}" | 193 | BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}" |
194 | # flags for -cross | 194 | # flags for -cross |
195 | TARGET_CFLAGS_append = " ${GLOBAL_FLAGS}" | 195 | TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" |
196 | TARGET_CXXFLAGS_append = " ${GLOBAL_FLAGS}" | 196 | TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" |