summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-22 08:35:32 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-22 08:35:55 +0200
commit16d2275003f59f21a41cb37eda8ef6b29fb450a4 (patch)
tree297c608e5cd1e02a72dfc49322084d45393a8d5b /dev-libs/icu
parentdev-libs/json-c: version bump to 0.12.1 (diff)
downloadgentoo-16d2275003f59f21a41cb37eda8ef6b29fb450a4.tar.gz
gentoo-16d2275003f59f21a41cb37eda8ef6b29fb450a4.tar.bz2
gentoo-16d2275003f59f21a41cb37eda8ef6b29fb450a4.zip
dev-libs/icu: Fix build with glibc-2.26, bug 628750
Closes: https://bugs.gentoo.org/628750 Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'dev-libs/icu')
-rw-r--r--dev-libs/icu/files/icu-58.2-glibc226.patch16
-rw-r--r--dev-libs/icu/icu-58.2-r1.ebuild1
-rw-r--r--dev-libs/icu/icu-59.1.ebuild1
3 files changed, 18 insertions, 0 deletions
diff --git a/dev-libs/icu/files/icu-58.2-glibc226.patch b/dev-libs/icu/files/icu-58.2-glibc226.patch
new file mode 100644
index 000000000000..7003173a13f9
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-glibc226.patch
@@ -0,0 +1,16 @@
+diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp
+--- a/i18n/digitlst.cpp 2016-10-27 01:37:56.000000000 -0000
++++ b/i18n/digitlst.cpp 2017-09-21 20:39:29.873030393 -0000
+@@ -61,11 +61,7 @@
+ #endif
+
+ #if U_USE_STRTOD_L
+-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+-# include <locale.h>
+-# else
+-# include <xlocale.h>
+-# endif
++# include <locale.h>
+ #endif
+
+ // ***************************************************************************
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 57eae1a6805d..86abec06ec35 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
"${FILESDIR}/${PN}-58.1-iterator.patch"
"${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch"
+ "${FILESDIR}/${PN}-58.2-glibc226.patch"
)
pkg_pretend() {
diff --git a/dev-libs/icu/icu-59.1.ebuild b/dev-libs/icu/icu-59.1.ebuild
index c8f9ddca1727..ed8bc1c9d952 100644
--- a/dev-libs/icu/icu-59.1.ebuild
+++ b/dev-libs/icu/icu-59.1.ebuild
@@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=(
PATCHES=(
"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+ "${FILESDIR}/${PN}-58.2-glibc226.patch"
)
pkg_pretend() {