From bb24c965a55d7e757c1e2a6e76bdb68d2bfb6ce3 Mon Sep 17 00:00:00 2001 From: Stefan Mueller-Klieser Date: Tue, 9 Jul 2024 08:25:39 +0200 Subject: [PATCH] icu: fix make-icudata package config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The location of files changed during unpackdir transition. Adapt dirs to fix custom icu data generation. Signed-off-by: Stefan Müller-Klieser Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu_75-1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/icu/icu_75-1.bb b/meta/recipes-support/icu/icu_75-1.bb index 14fbf31de57..27fe392e4d4 100644 --- a/meta/recipes-support/icu/icu_75-1.bb +++ b/meta/recipes-support/icu/icu_75-1.bb @@ -126,7 +126,7 @@ do_make_icudata:class-target () { ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} cd ${S} rm -rf data - cp -a ${WORKDIR}/data . + cp -a ${UNPACKDIR}/data . AR='${BUILD_AR}' \ CC='${BUILD_CC}' \ CPP='${BUILD_CPP}' \ @@ -136,7 +136,7 @@ do_make_icudata:class-target () { CPPFLAGS='${BUILD_CPPFLAGS}' \ CXXFLAGS='${BUILD_CXXFLAGS}' \ LDFLAGS='${BUILD_LDFLAGS}' \ - ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ + ICU_DATA_FILTER_FILE=${UNPACKDIR}/filter.json \ ./runConfigureICU Linux --with-data-packaging=archive oe_runmake install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat -- 2.47.2