diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-05-12 13:09:23 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-05-19 08:57:20 -0700 |
| commit | f780b27120085ce2d69f287e7d551f03576444f2 (patch) | |
| tree | 9373d568d4edb4f7bcbce3aff12d27bd1c5ab4a9 | |
| parent | 8b86f5919798b8a52e0340ed944f9bf24fbac9c6 (diff) | |
| download | poky-f780b27120085ce2d69f287e7d551f03576444f2.tar.gz | |
icu: set ac_cv_path_install to ensure install tool reproducibility
icu will check program install path during do_configure, eg:
checking for a BSD-compatible install... /path/to/install -c
And this path will be writen into pkgdata.inc:
INSTALL_CMD=$(INSTALL-L)
Decided by if install is installed into recipe-sysroot-native during
do_configure stage, the INSTALL_CMD could be
/build/tmp/work/corei7-64-wrs-linux/icu/76-1/recipe-sysroot-native/usr/bin/install
or /build/tmp/hosttools/install if the build is rerun after the sysroot was
extended.
set ac_cv_path_install to install under hosttools to make a deterministic
result of INSTALL_CMD, avoid vary caused by the execute sequence of
another task which DEPENDS on coreutils-native and independent with
do_configure
[RP: Removed paths from ac_cv_path_install to simplify and avoid QA error too]
(From OE-Core rev: 208143e060cda6e22ae1e8c618e033fa9144b323)
(From OE-Core rev: 60a38959a5b740b16044bf8644046b3ed4816ae7)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-support/icu/icu_76-1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/icu/icu_76-1.bb b/meta/recipes-support/icu/icu_76-1.bb index f0890fc890..f11e72d356 100644 --- a/meta/recipes-support/icu/icu_76-1.bb +++ b/meta/recipes-support/icu/icu_76-1.bb | |||
| @@ -20,9 +20,9 @@ inherit autotools pkgconfig github-releases | |||
| 20 | # ICU needs the native build directory as an argument to its --with-cross-build option when | 20 | # ICU needs the native build directory as an argument to its --with-cross-build option when |
| 21 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache | 21 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache |
| 22 | # into consideration, the native build directory needs to be staged. | 22 | # into consideration, the native build directory needs to be staged. |
| 23 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" | 23 | EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config ac_cv_path_install='install -c'" |
| 24 | EXTRA_OECONF:class-native = "--disable-icu-config" | 24 | EXTRA_OECONF:class-native = "--disable-icu-config ac_cv_path_install='install -c'" |
| 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 ac_cv_path_install='install -c'" |
| 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}/${@icu_install_folder(d)}\\""', '', d)}" | 28 | TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${@icu_install_folder(d)}\\""', '', d)}" |