| Message ID | 20240709062539.4581-1-s.mueller-klieser@phytec.de |
|---|---|
| State | Accepted, archived |
| Commit | bb24c965a55d7e757c1e2a6e76bdb68d2bfb6ce3 |
| Headers | show |
| Series | icu: fix make-icudata package config | expand |
On Tue, 2024-07-09 at 08:25 +0200, Stefan Mueller-Klieser via lists.openembedded.org wrote: > The location of files changed during unpackdir transition. Adapt dirs > to fix custom icu data generation. > > Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> > --- > 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 14fbf31de5..27fe392e4d 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 > Thanks for the fix. Are there any tests we should add to detect problems earlier in future? Cheers, Richard
diff --git a/meta/recipes-support/icu/icu_75-1.bb b/meta/recipes-support/icu/icu_75-1.bb index 14fbf31de5..27fe392e4d 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
The location of files changed during unpackdir transition. Adapt dirs to fix custom icu data generation. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> --- meta/recipes-support/icu/icu_75-1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)