4181ea8c1c
- Add arm64 support [1] - Fix segfault on i386 [2] - Switch to USES=compiler:c++14-lang for devel/chromium-gn because chromium needs __builtin_add_overflow and friends to build. Changelog: https://chromium.googlesource.com/chromium/src/+log/60.0.3112.113..61.0.3163.79?pretty=fuller&n=10000 PR: 220291 [1], 221266 [2] Submitted by: Andrew [1] Reported by: Patrick <doctorwhoguy@gmail.com> [2] MFH: 2017Q3
20 lines
934 B
C++
20 lines
934 B
C++
--- base/i18n/icu_util.cc.orig 2017-09-05 21:05:11.000000000 +0200
|
|
+++ base/i18n/icu_util.cc 2017-09-06 16:47:26.158180000 +0200
|
|
@@ -20,7 +20,7 @@
|
|
#include "build/build_config.h"
|
|
#include "third_party/icu/source/common/unicode/putil.h"
|
|
#include "third_party/icu/source/common/unicode/udata.h"
|
|
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
|
|
#include "third_party/icu/source/i18n/unicode/timezone.h"
|
|
#endif
|
|
|
|
@@ -312,7 +312,7 @@
|
|
// TODO(jungshik): Some callers do not care about tz at all. If necessary,
|
|
// add a boolean argument to this function to init'd the default tz only
|
|
// when requested.
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
if (result)
|
|
std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
|
#endif
|