From 0937885bc90bd2c2d938bd2e16e0c164e80625fe Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 21 Jul 2020 18:09:47 +0300
Subject: Release version 65.1.0+4

Fix Clang 10 compilation errors

Canonicalize license in manifests

Add glue buildfile
---
 libicui18n/libicui18n/buildfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'libicui18n/libicui18n/buildfile')

diff --git a/libicui18n/libicui18n/buildfile b/libicui18n/libicui18n/buildfile
index a2391b1..6ec314f 100644
--- a/libicui18n/libicui18n/buildfile
+++ b/libicui18n/libicui18n/buildfile
@@ -1,9 +1,11 @@
 # file      : libicui18n/buildfile
 # license   : Unicode License; see accompanying LICENSE file
 
-import int_libs = libicuuc%lib{icuuc}
+import intf_libs = libicuuc%lib{icuuc}
 
-lib{icui18n}: {hxx cxx}{**} $int_libs
+patched = stsearch olsontz vtzone rbtz dtitvfmt basictz
+
+lib{icui18n}: {hxx}{**} i18n/cxx{* -{$patched}} cxx{$patched} $intf_libs
 
 tclass = $cxx.target.class
 tsys   = $cxx.target.system
@@ -52,9 +54,11 @@ switch $cxx.class, $tsys
     # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem
     # to care about these and it is not easy to disable specific warnings in a
     # way that works across compilers/version (some -Wno-* options are only
-    # recognized in newer versions).
+    # recognized in newer versions). There are still some warnings left that
+    # appear for certain platforms/compilers. We pass them through but disable
+    # treating them as errors.
     #
-    cxx.coptions += -Wno-all -Wno-extra
+    cxx.coptions += -Wno-all -Wno-extra -Wno-error
 
     # Disable the Clang targeting MSVC warnings.
     #
@@ -108,7 +112,7 @@ switch $tclass, $tsys
 lib{icui18n}:
 {
   cc.export.poptions = "-I$src_base/i18n"
-  cc.export.libs     = $int_libs
+  cc.export.libs     = $intf_libs
 }
 
 liba{icui18n}: cc.export.poptions += -DU_STATIC_IMPLEMENTATION
-- 
cgit v1.1