diff options
Diffstat (limited to 'poky/meta/recipes-support/icu')
| -rw-r--r-- | poky/meta/recipes-support/icu/icu.inc | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 34 | ||||
| -rw-r--r-- | poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch | 27 | ||||
| -rw-r--r-- | poky/meta/recipes-support/icu/icu_62.1.bb (renamed from poky/meta/recipes-support/icu/icu_60.2.bb) | 8 |
4 files changed, 36 insertions, 39 deletions
diff --git a/poky/meta/recipes-support/icu/icu.inc b/poky/meta/recipes-support/icu/icu.inc index 983118cd6..e20085fbf 100644 --- a/poky/meta/recipes-support/icu/icu.inc +++ b/poky/meta/recipes-support/icu/icu.inc @@ -19,7 +19,9 @@ BINCONFIG = "${bindir}/icu-config" ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" -inherit autotools pkgconfig binconfig +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" # ICU needs the native build directory as an argument to its --with-cross-build option when # cross-compiling. Taken the situation that different builds may share a common sstate-cache @@ -31,6 +33,8 @@ EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +ASNEEDED = "" + # strtod_l() is not supported by musl; also xlocale.h is missing # It is not possible to disable its use via configure switches or env vars # so monkey patching is needed. diff --git a/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch deleted file mode 100644 index f0c49e197..000000000 --- a/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 24 Jun 2017 22:52:40 -0700 -Subject: [PATCH 3/4] i18n: Drop include <xlocale.h> - -glibc 2.26 drops this header - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - source/i18n/digitlst.cpp | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp -index 8e86fa7..0bdbb2c 100644 ---- a/i18n/digitlst.cpp -+++ b/i18n/digitlst.cpp -@@ -62,11 +62,7 @@ - #endif - - #if U_USE_STRTOD_L --# if U_HAVE_XLOCALE_H --# include <xlocale.h> --# else --# include <locale.h> --# endif -+# include <locale.h> - #endif - - // *************************************************************************** --- -2.14.2 - diff --git a/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch b/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch new file mode 100644 index 000000000..20e3d8356 --- /dev/null +++ b/poky/meta/recipes-support/icu/icu/0002-Add-ARC-support.patch @@ -0,0 +1,27 @@ +From fcfd57105b4bdb30d906df152ef01748fa95daff Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin <abrodkin@synopsys.com> +Date: Thu, 13 Sep 2018 17:13:20 +0300 +Subject: [PATCH] icu: Add ARC support + +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> + +Upstream-Status: Submitted [ https://github.com/unicode-org/icu/pull/149 ] +--- + i18n/double-conversion-utils.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +index 57fc49b231a3..0bd3e8340673 100644 +--- a/i18n/double-conversion-utils.h ++++ b/i18n/double-conversion-utils.h +@@ -86,7 +86,7 @@ inline void abort_noreturn() { abort(); } + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || \ +- defined(__riscv) ++ defined(__riscv) || defined(__arc__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) + #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS +2.17.1 + diff --git a/poky/meta/recipes-support/icu/icu_60.2.bb b/poky/meta/recipes-support/icu/icu_62.1.bb index 585a92bc4..4e3750b99 100644 --- a/poky/meta/recipes-support/icu/icu_60.2.bb +++ b/poky/meta/recipes-support/icu/icu_62.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=63752c57bd0b365c9af9f427ef79c819" def icu_download_version(d): pvsplit = d.getVar('PV').split('.') @@ -16,14 +16,14 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - file://0001-i18n-Drop-include-xlocale.h.patch \ + file://0002-Add-ARC-support.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "43861b127744b3c0b9d7f386f4b9fa40" -SRC_URI[sha256sum] = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418" +SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" +SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" |
