From: Makarios Christakis Date: Sun, 16 Mar 2025 19:13:43 +0000 (+0200) Subject: icu: Adjust ICU_DATA_DIR path on big endian targets X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1689c4fe872540c48af07b482e65646928eaf516;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git icu: Adjust ICU_DATA_DIR path on big endian targets On big-endian systems the preprocessor define ICU_DATA_DIR is currently being set to a path ending with the ${PV} of the recipe. The PV version string has changed to a '-' separator since oe-core commit cebe8439cdc656d53355506a31a3782312bf03c5 whereas the build system installs the data files into a path ending with the dot-separated version of ICU. This causes the ICU data file to not be detected at runtime, consequently breaking any dependant applications. We therefore substitute ${PV} with the dot-separated version string of ICU, as returned from the icu_install_folder function, on the ICU_DATA_DIR define on big-endian targets. Signed-off-by: Makarios Christakis Signed-off-by: Richard Purdie (cherry picked from commit 28cdc0110def011e3d690da1d591076385267ef7) Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-support/icu/icu_75-1.bb b/meta/recipes-support/icu/icu_75-1.bb index 8f7f5e6cc71..73d4a7cf6c9 100644 --- a/meta/recipes-support/icu/icu_75-1.bb +++ b/meta/recipes-support/icu/icu_75-1.bb @@ -25,7 +25,7 @@ EXTRA_OECONF:class-native = "--disable-icu-config" 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)}" -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}/${@icu_install_folder(d)}\\""', '', d)}" ASNEEDED = ""