diff options
| author | Makarios Christakis <makchrbiz@gmail.com> | 2025-03-16 21:13:43 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-17 17:09:22 +0000 |
| commit | 4acbabd87b8ea643c70ac957197ba7a212338b9d (patch) | |
| tree | b7115292871fc8425dbc0589a0a6dcca4fbdbd5d | |
| parent | 4b1a1fd6d44d3fdd675fa4e7b143d6b948226f28 (diff) | |
| download | poky-4acbabd87b8ea643c70ac957197ba7a212338b9d.tar.gz | |
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.
(From OE-Core rev: 28cdc0110def011e3d690da1d591076385267ef7)
Signed-off-by: Makarios Christakis <makchrbiz@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/icu/icu_76-1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/icu/icu_76-1.bb b/meta/recipes-support/icu/icu_76-1.bb index 08dabde3ae..f0890fc890 100644 --- a/meta/recipes-support/icu/icu_76-1.bb +++ b/meta/recipes-support/icu/icu_76-1.bb | |||
| @@ -25,7 +25,7 @@ EXTRA_OECONF:class-native = "--disable-icu-config" | |||
| 25 | EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" | 25 | EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" |
| 26 | 26 | ||
| 27 | EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" | 27 | EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" |
| 28 | TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" | 28 | TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${@icu_install_folder(d)}\\""', '', d)}" |
| 29 | 29 | ||
| 30 | ASNEEDED = "" | 30 | ASNEEDED = "" |
| 31 | 31 | ||
