summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Mueller-Klieser <S.Mueller-Klieser@phytec.de>2024-07-09 08:25:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-10 10:52:20 +0100
commitec25e2861353a0fdce65080458ab885cf03bafac (patch)
tree1d91b2e0013f97d78f16ed53a63533e19a57e4fe
parent83fc33db5e4e94eeffb0580efd3b482fc28c77a5 (diff)
downloadpoky-ec25e2861353a0fdce65080458ab885cf03bafac.tar.gz
icu: fix make-icudata package config
The location of files changed during unpackdir transition. Adapt dirs to fix custom icu data generation. (From OE-Core rev: bb24c965a55d7e757c1e2a6e76bdb68d2bfb6ce3) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/icu/icu_75-1.bb4
1 files 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 () {
126 ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} 126 ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
127 cd ${S} 127 cd ${S}
128 rm -rf data 128 rm -rf data
129 cp -a ${WORKDIR}/data . 129 cp -a ${UNPACKDIR}/data .
130 AR='${BUILD_AR}' \ 130 AR='${BUILD_AR}' \
131 CC='${BUILD_CC}' \ 131 CC='${BUILD_CC}' \
132 CPP='${BUILD_CPP}' \ 132 CPP='${BUILD_CPP}' \
@@ -136,7 +136,7 @@ do_make_icudata:class-target () {
136 CPPFLAGS='${BUILD_CPPFLAGS}' \ 136 CPPFLAGS='${BUILD_CPPFLAGS}' \
137 CXXFLAGS='${BUILD_CXXFLAGS}' \ 137 CXXFLAGS='${BUILD_CXXFLAGS}' \
138 LDFLAGS='${BUILD_LDFLAGS}' \ 138 LDFLAGS='${BUILD_LDFLAGS}' \
139 ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ 139 ICU_DATA_FILTER_FILE=${UNPACKDIR}/filter.json \
140 ./runConfigureICU Linux --with-data-packaging=archive 140 ./runConfigureICU Linux --with-data-packaging=archive
141 oe_runmake 141 oe_runmake
142 install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat 142 install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat