diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-support/icu | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/icu')
-rw-r--r-- | meta/recipes-support/icu/icu_69.1.bb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-support/icu/icu_69.1.bb b/meta/recipes-support/icu/icu_69.1.bb index bfeea8d2f0..4daf0fe82e 100644 --- a/meta/recipes-support/icu/icu_69.1.bb +++ b/meta/recipes-support/icu/icu_69.1.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "http://site.icu-project.org/" | |||
7 | 7 | ||
8 | LICENSE = "ICU" | 8 | LICENSE = "ICU" |
9 | DEPENDS = "icu-native" | 9 | DEPENDS = "icu-native" |
10 | DEPENDS_class-native = "" | 10 | DEPENDS:class-native = "" |
11 | 11 | ||
12 | CVE_PRODUCT = "international_components_for_unicode" | 12 | CVE_PRODUCT = "international_components_for_unicode" |
13 | 13 | ||
@@ -27,15 +27,15 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" | |||
27 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache | 27 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache |
28 | # into consideration, the native build directory needs to be staged. | 28 | # into consideration, the native build directory needs to be staged. |
29 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" | 29 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" |
30 | EXTRA_OECONF_class-native = "" | 30 | EXTRA_OECONF:class-native = "" |
31 | EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" | 31 | EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" |
32 | 32 | ||
33 | EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" | 33 | EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" |
34 | TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" | 34 | TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" |
35 | 35 | ||
36 | ASNEEDED = "" | 36 | ASNEEDED = "" |
37 | 37 | ||
38 | do_compile_prepend_class-target () { | 38 | do_compile:prepend:class-target () { |
39 | # Make sure certain build host references do not end up being compiled | 39 | # Make sure certain build host references do not end up being compiled |
40 | # in the image. This only affects libicutu and icu-dbg | 40 | # in the image. This only affects libicutu and icu-dbg |
41 | sed \ | 41 | sed \ |
@@ -45,7 +45,7 @@ do_compile_prepend_class-target () { | |||
45 | } | 45 | } |
46 | 46 | ||
47 | PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" | 47 | PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" |
48 | do_install_append_class-native() { | 48 | do_install:append:class-native() { |
49 | mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config | 49 | mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config |
50 | cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config | 50 | cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config |
51 | cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config | 51 | cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config |
@@ -54,7 +54,7 @@ do_install_append_class-native() { | |||
54 | cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} | 54 | cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} |
55 | } | 55 | } |
56 | 56 | ||
57 | do_install_append_class-target() { | 57 | do_install:append:class-target() { |
58 | # The native pkgdata can not generate the correct data file. | 58 | # The native pkgdata can not generate the correct data file. |
59 | # Use icupkg to re-generate it. | 59 | # Use icupkg to re-generate it. |
60 | if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then | 60 | if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then |
@@ -73,13 +73,13 @@ do_install_append_class-target() { | |||
73 | 73 | ||
74 | PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" | 74 | PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" |
75 | 75 | ||
76 | FILES_${PN}-dev += "${libdir}/${BPN}/" | 76 | FILES:${PN}-dev += "${libdir}/${BPN}/" |
77 | 77 | ||
78 | FILES_libicudata = "${libdir}/libicudata.so.*" | 78 | FILES:libicudata = "${libdir}/libicudata.so.*" |
79 | FILES_libicuuc = "${libdir}/libicuuc.so.*" | 79 | FILES:libicuuc = "${libdir}/libicuuc.so.*" |
80 | FILES_libicui18n = "${libdir}/libicui18n.so.*" | 80 | FILES:libicui18n = "${libdir}/libicui18n.so.*" |
81 | FILES_libicutu = "${libdir}/libicutu.so.*" | 81 | FILES:libicutu = "${libdir}/libicutu.so.*" |
82 | FILES_libicuio = "${libdir}/libicuio.so.*" | 82 | FILES:libicuio = "${libdir}/libicuio.so.*" |
83 | 83 | ||
84 | BBCLASSEXTEND = "native nativesdk" | 84 | BBCLASSEXTEND = "native nativesdk" |
85 | 85 | ||
@@ -97,8 +97,8 @@ ICU_PV = "${@icu_download_version(d)}" | |||
97 | ICU_FOLDER = "${@icu_download_folder(d)}" | 97 | ICU_FOLDER = "${@icu_download_folder(d)}" |
98 | 98 | ||
99 | # http://errors.yoctoproject.org/Errors/Details/20486/ | 99 | # http://errors.yoctoproject.org/Errors/Details/20486/ |
100 | ARM_INSTRUCTION_SET_armv4 = "arm" | 100 | ARM_INSTRUCTION_SET:armv4 = "arm" |
101 | ARM_INSTRUCTION_SET_armv5 = "arm" | 101 | ARM_INSTRUCTION_SET:armv5 = "arm" |
102 | 102 | ||
103 | BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" | 103 | BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" |
104 | DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" | 104 | DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" |
@@ -109,7 +109,7 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
109 | file://0001-icu-Added-armeb-support.patch \ | 109 | file://0001-icu-Added-armeb-support.patch \ |
110 | " | 110 | " |
111 | 111 | ||
112 | SRC_URI_append_class-target = "\ | 112 | SRC_URI:append:class-target = "\ |
113 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 113 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
114 | " | 114 | " |
115 | SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" | 115 | SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" |
@@ -118,12 +118,12 @@ SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204 | |||
118 | UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" | 118 | UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src" |
119 | UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" | 119 | UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" |
120 | 120 | ||
121 | EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" | 121 | EXTRA_OECONF:append:libc-musl = " ac_cv_func_strtod_l=no" |
122 | 122 | ||
123 | PACKAGECONFIG ?= "" | 123 | PACKAGECONFIG ?= "" |
124 | PACKAGECONFIG[make-icudata] = ",,," | 124 | PACKAGECONFIG[make-icudata] = ",,," |
125 | 125 | ||
126 | do_make_icudata_class-target () { | 126 | do_make_icudata:class-target () { |
127 | ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} | 127 | ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} |
128 | cd ${S} | 128 | cd ${S} |
129 | rm -rf data | 129 | rm -rf data |