diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/icu/icu_71.1.bb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-support/icu/icu_71.1.bb b/meta/recipes-support/icu/icu_71.1.bb index d8ef2a3746..b39633c203 100644 --- a/meta/recipes-support/icu/icu_71.1.bb +++ b/meta/recipes-support/icu/icu_71.1.bb | |||
| @@ -15,20 +15,16 @@ S = "${WORKDIR}/icu/source" | |||
| 15 | SPDX_S = "${WORKDIR}/icu" | 15 | SPDX_S = "${WORKDIR}/icu" |
| 16 | STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" | 16 | STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" |
| 17 | 17 | ||
| 18 | BINCONFIG = "${bindir}/icu-config" | ||
| 19 | |||
| 20 | ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" | 18 | ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" |
| 21 | 19 | ||
| 22 | inherit autotools pkgconfig binconfig multilib_script | 20 | inherit autotools pkgconfig |
| 23 | |||
| 24 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" | ||
| 25 | 21 | ||
| 26 | # ICU needs the native build directory as an argument to its --with-cross-build option when | 22 | # ICU needs the native build directory as an argument to its --with-cross-build option when |
| 27 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache | 23 | # 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. | 24 | # into consideration, the native build directory needs to be staged. |
| 29 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" | 25 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" |
| 30 | EXTRA_OECONF:class-native = "" | 26 | EXTRA_OECONF:class-native = "--disable-icu-config" |
| 31 | EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" | 27 | EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" |
| 32 | 28 | ||
| 33 | EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" | 29 | 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)}" | 30 | TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" |
| @@ -67,7 +63,7 @@ do_install:append:class-target() { | |||
| 67 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ | 63 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ |
| 68 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | 64 | -e 's|${DEBUG_PREFIX_MAP}||g' \ |
| 69 | -e 's:${HOSTTOOLS_DIR}/::g' \ | 65 | -e 's:${HOSTTOOLS_DIR}/::g' \ |
| 70 | ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ | 66 | ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ |
| 71 | ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc | 67 | ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc |
| 72 | } | 68 | } |
| 73 | 69 | ||
