diff mbox series

[BACKPORT] icu: Adjust ICU_DATA_DIR path on big endian targets

Message ID CANpL8OsjDEO6gw_j+YphY9PNx3SV1AK0dTsG353spS6UDK63EQ@mail.gmail.com
State New
Headers show
Series [BACKPORT] icu: Adjust ICU_DATA_DIR path on big endian targets | expand

Commit Message

Makarios Christakis March 18, 2025, 7:10 a.m. UTC
Hello Steve,

I would like to backport this bugfix from master to Styhead and Scarthgap.

oe-core master ref: 28cdc0110def011e3d690da1d591076385267ef7

Let me know if this is not the proper way to request this.

Thanks for your efforts,

Makarios Christakis

--
commit 28cdc0110def011e3d690da1d591076385267ef7
Author: Makarios Christakis <makchrbiz@gmail.com>
Date:   Sun Mar 16 21:13:43 2025 +0200

    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 <makchrbiz@gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/icu/icu_76-1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

"${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', '
-DICU_DATA_DIR=\\""${datadir}/${BPN}/${@icu_install_folder(d)}\\""',
'', d)}"

 ASNEEDED = ""

Comments

patchtest@automation.yoctoproject.org March 18, 2025, 7:16 a.m. UTC | #1
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/BACKPORT-icu-Adjust-ICU_DATA_DIR-path-on-big-endian-targets.patch

FAIL: test Signed-off-by presence: Mbox is missing Signed-off-by. Add it manually or with "git commit --amend -s" (test_mbox.TestMbox.test_signed_off_by_presence)
FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format)

PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: Parse error Hunk diff line expected: "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
SKIP: test Signed-off-by presence: Parse error Hunk diff line expected: "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
SKIP: test Upstream-Status presence: Parse error Hunk diff line expected: "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config"
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: Python-unidiff parse error (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
diff mbox series

Patch

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"
 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 =