Browse Source

Merge pull request #8868 from neheb/icu

icu: Fix compilation with uClibc-ng
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
6e9beb0a51
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
  1. +1
    -1
      libs/icu/Makefile
  2. +22
    -0
      libs/icu/patches/020-uClibc-ng.patch

+ 1
- 1
libs/icu/Makefile View File

@ -11,7 +11,7 @@ PKG_NAME:=icu4c
MAJOR_VERSION:=64
MINOR_VERSION:=2
PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)


+ 22
- 0
libs/icu/patches/020-uClibc-ng.patch View File

@ -0,0 +1,22 @@
--- a/i18n/decimfmt.cpp
+++ b/i18n/decimfmt.cpp
@@ -1812,7 +1812,7 @@ bool DecimalFormat::fastFormatDouble(double input, UnicodeString& output) const
return false;
}
if (std::isnan(input)
- || std::trunc(input) != input
+ || trunc(input) != input
|| input <= INT32_MIN
|| input > INT32_MAX) {
return false;
--- a/i18n/number_decimalquantity.cpp
+++ b/i18n/number_decimalquantity.cpp
@@ -446,7 +446,7 @@ void DecimalQuantity::_setToDoubleFast(double n) {
for (; i <= -22; i += 22) n /= 1e22;
n /= DOUBLE_MULTIPLIERS[-i];
}
- auto result = static_cast<int64_t>(std::round(n));
+ auto result = static_cast<int64_t>(round(n));
if (result != 0) {
_setToLong(result);
scale -= fracLength;

Loading…
Cancel
Save