From dfbecfe5a8940e5b931bcc965167679f03713ec0 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@konsulko.com>
Date: Wed, 7 Feb 2024 16:05:14 -0500
Subject: icu: update bbappend for 74-1 version

Also, new version now uses - instead of . for version separator.

Bug-AGL: SPEC-4578

Change-Id: Ibbef7a7631e923ec6c7ec189b2cc2463fb1d0c05
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-support/icu/icu_70.1.bbappend    |  1 -
 recipes-support/icu/icu_70.1_agldemo.inc | 27 ---------------------------
 recipes-support/icu/icu_74-1.bbappend    |  1 +
 recipes-support/icu/icu_74-1_agldemo.inc | 27 +++++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 recipes-support/icu/icu_70.1.bbappend
 delete mode 100644 recipes-support/icu/icu_70.1_agldemo.inc
 create mode 100644 recipes-support/icu/icu_74-1.bbappend
 create mode 100644 recipes-support/icu/icu_74-1_agldemo.inc

(limited to 'recipes-support')

diff --git a/recipes-support/icu/icu_70.1.bbappend b/recipes-support/icu/icu_70.1.bbappend
deleted file mode 100644
index b30ade49e..000000000
--- a/recipes-support/icu/icu_70.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_70.1_agldemo.inc', '', d)}
\ No newline at end of file
diff --git a/recipes-support/icu/icu_70.1_agldemo.inc b/recipes-support/icu/icu_70.1_agldemo.inc
deleted file mode 100644
index 957fe0838..000000000
--- a/recipes-support/icu/icu_70.1_agldemo.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGECONFIG:append = " make-icudata"
-
-do_compile:append () {
-    # just adding below does not enforce a full rebuild
-    # thus force rebuild and investigate
-    echo "new"
-}
-
-do_make_icudata:class-native () {
-    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
-    cd ${S}
-    rm -rf data
-    cp -a ${WORKDIR}/data .
-    AR='${BUILD_AR}' \
-    CC='${BUILD_CC}' \
-    CPP='${BUILD_CPP}' \
-    CXX='${BUILD_CXX}' \
-    RANLIB='${BUILD_RANLIB}' \
-    CFLAGS='${BUILD_CFLAGS}' \
-    CPPFLAGS='${BUILD_CPPFLAGS}' \
-    CXXFLAGS='${BUILD_CXXFLAGS}' \
-    LDFLAGS='${BUILD_LDFLAGS}' \
-    ICU_DATA_FILTER_FILE=${WORKDIR}/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
-}
diff --git a/recipes-support/icu/icu_74-1.bbappend b/recipes-support/icu/icu_74-1.bbappend
new file mode 100644
index 000000000..cf4061e92
--- /dev/null
+++ b/recipes-support/icu/icu_74-1.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'icu_74-1_agldemo.inc', '', d)}
diff --git a/recipes-support/icu/icu_74-1_agldemo.inc b/recipes-support/icu/icu_74-1_agldemo.inc
new file mode 100644
index 000000000..957fe0838
--- /dev/null
+++ b/recipes-support/icu/icu_74-1_agldemo.inc
@@ -0,0 +1,27 @@
+PACKAGECONFIG:append = " make-icudata"
+
+do_compile:append () {
+    # just adding below does not enforce a full rebuild
+    # thus force rebuild and investigate
+    echo "new"
+}
+
+do_make_icudata:class-native () {
+    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
+    cd ${S}
+    rm -rf data
+    cp -a ${WORKDIR}/data .
+    AR='${BUILD_AR}' \
+    CC='${BUILD_CC}' \
+    CPP='${BUILD_CPP}' \
+    CXX='${BUILD_CXX}' \
+    RANLIB='${BUILD_RANLIB}' \
+    CFLAGS='${BUILD_CFLAGS}' \
+    CPPFLAGS='${BUILD_CPPFLAGS}' \
+    CXXFLAGS='${BUILD_CXXFLAGS}' \
+    LDFLAGS='${BUILD_LDFLAGS}' \
+    ICU_DATA_FILTER_FILE=${WORKDIR}/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
+}
-- 
cgit 1.2.3-korg