mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

icu: Drop binconfig support (icu-config)

Browse Source 
Upstream have indicated icu-config is deprecated and they don't intend
people to use it any more. Drop our code for it to flush out users and
clean up our recipe a bit. pkg-config is a much better alternative.

(https://github.com/unicode-org/icu/pull/2150)

(From OE-Core rev: 9b121df8d9f2a46bb08992725f97ba03e878a609)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-08-22 15:09:49 +01:00
parent 0972526d2a
commit c7bc4e5968
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/icu/icu_71.1.bb
+5 -9
View File
@@ -15,20 +15,16 @@ S = "${WORKDIR}/icu/source"
SPDX_S = "${WORKDIR}/icu" SPDX_S = "${WORKDIR}/icu"
STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
BINCONFIG = "${bindir}/icu-config"
ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}"
inherit autotools pkgconfig binconfig multilib_script inherit autotools pkgconfig
MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config"
# ICU needs the native build directory as an argument to its --with-cross-build option when # ICU needs the native build directory as an argument to its --with-cross-build option when
# cross-compiling. Taken the situation that different builds may share a common sstate-cache # cross-compiling. Taken the situation that different builds may share a common sstate-cache
# into consideration, the native build directory needs to be staged. # into consideration, the native build directory needs to be staged.
EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
EXTRA_OECONF:class-native = "" EXTRA_OECONF:class-native = "--disable-icu-config"
EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" 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() {
-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-e 's|${DEBUG_PREFIX_MAP}||g' \ -e 's|${DEBUG_PREFIX_MAP}||g' \
-e 's:${HOSTTOOLS_DIR}/::g' \ -e 's:${HOSTTOOLS_DIR}/::g' \
${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
${D}/${libdir}/${BPN}/${PV}/pkgdata.inc ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc
} }