Skip to contentSkip to conversation

icu: Backport version 74-2 from oe-core

PATCH New Ryan Eatmon 1 participant 1 message Jun 14, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 icu: Backport version 74-2 from oe-core

To address a compilation issue with qtwebkit, we are backporting the 74-2 version from oe-core [1] and preferring this version of ICU for Arago.

[1] https://git.openembedded.org/openembedded-core/plain/meta/recipes-support/icu/icu_74-2.bb?id=eeed9f6a8e83eb29da8cb69a25dd690712e3ac1b

---
 .../conf/distro/include/arago-prefs.inc       |   3 +
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch |  25 +++
 .../icu/0001-icu-Added-armeb-support.patch    |  27 ++++
 .../recipes-support/icu/icu/filter.json       |   2 +
 .../icu/icu/fix-install-manx.patch            |  55 +++++++
 .../recipes-support/icu/icu_74-2.bb           | 149 ++++++++++++++++++
 6 files changed, 261 insertions(+)
 create mode 100644 meta-arago-distro/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
 create mode 100644 meta-arago-distro/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
 create mode 100644 meta-arago-distro/recipes-support/icu/icu/filter.json
 create mode 100644 meta-arago-distro/recipes-support/icu/icu/fix-install-manx.patch
 create mode 100644 meta-arago-distro/recipes-support/icu/icu_74-2.bb
meta-arago-distro/conf/distro/include/arago-prefs.inc +3 -0
index 34c3c539..beb3575e 100644
@@ -19,3 +19,6 @@ PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
 #PREFERRED_PROVIDER_wpa-supplicant:ti33x = "wpa-supplicant-wl18xx"
 #PREFERRED_PROVIDER_wpa-supplicant:ti43x = "wpa-supplicant-wl18xx"
 #PREFERRED_PROVIDER_wpa-supplicant:omap-a15 = "wpa-supplicant-wl18xx"
+
+# Temporarily carry icu patch and prefer this version to fix qtwebkit compile issue.
+PREFERRED_VERSION_icu = "74-2"
meta-arago-distro/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch new file +25 -0
new file mode 100644
index 00000000..c0e9e280
@@ -0,0 +1,25 @@
+From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 15 Feb 2014 21:06:42 +0000
+Subject: [PATCH] Disable LDFLAGSICUDT for Linux
+
+Upstream-Status: Inappropriate [ OE Configuration ]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ config/mh-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/mh-linux b/config/mh-linux
+index 53d6780..b622513 100644
+--- a/config/mh-linux
++++ b/config/mh-linux
+@@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
+ LD_RPATH_PRE = -Wl,-rpath,
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++# LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
meta-arago-distro/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch new file +27 -0
new file mode 100644
index 00000000..a25285fb
@@ -0,0 +1,27 @@
+From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001
+From: Lei Maohui <[email protected]>
+Date: Wed, 8 May 2019 14:42:30 +0900
+Subject: [PATCH] icu: Added armeb support.
+
+Make icu support arm32 BE.
+
+Upstream-Status: Pending
+
+Signed-off-by: Lei Maohui <[email protected]>
+---
+ i18n/double-conversion-utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
+index 303668f..7d859dc 100644
+--- a/i18n/double-conversion-utils.h
++++ b/i18n/double-conversion-utils.h
+@@ -146,7 +146,7 @@ int main(int argc, char** argv) {
+ //
+ // If it prints "correct" then the architecture should be here, in the "correct" section.
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-    defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
++    defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
+     defined(__hppa__) || defined(__ia64__) || \
+     defined(__mips__) || \
+     defined(__loongarch__) || \
meta-arago-distro/recipes-support/icu/icu/filter.json new file +2 -0
new file mode 100644
index 00000000..2c63c085
@@ -0,0 +1,2 @@
+{
+}
meta-arago-distro/recipes-support/icu/icu/fix-install-manx.patch new file +55 -0

55 lines not on this page · raw message

meta-arago-distro/recipes-support/icu/icu_74-2.bb new file +149 -0

149 lines not on this page · raw message

Signature · 1 line
2.17.1