From 75d80b79a1fcf323515eaccbc9fc76641e60b354 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 25 Feb 2020 14:22:33 +0300
Subject: Release version 65.1.0+2

Fix linkage of statically built ICU libraries
---
 libicui18n/libicui18n/buildfile | 5 +++--
 libicui18n/manifest             | 2 +-
 libicuio/libicuio/buildfile     | 5 +++--
 libicuio/manifest               | 2 +-
 libicuuc/libicu/buildfile       | 6 +++---
 libicuuc/manifest               | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libicui18n/libicui18n/buildfile b/libicui18n/libicui18n/buildfile
index 988f400..a2391b1 100644
--- a/libicui18n/libicui18n/buildfile
+++ b/libicui18n/libicui18n/buildfile
@@ -41,8 +41,7 @@ switch $tclass, $tsys
 
 cxx.poptions =+ "-I$src_base/i18n"
 
-if $windows
-  obja{*}: cxx.poptions += -DU_STATIC_IMPLEMENTATION
+obja{*}: cxx.poptions += -DU_STATIC_IMPLEMENTATION
 
 switch $cxx.class, $tsys
 {
@@ -112,6 +111,8 @@ lib{icui18n}:
   cc.export.libs     = $int_libs
 }
 
+liba{icui18n}: cc.export.poptions += -DU_STATIC_IMPLEMENTATION
+
 # See bootstrap.build for details.
 #
 # Note that on Windows and POSIX the library is named quite differently as
diff --git a/libicui18n/manifest b/libicui18n/manifest
index 6df34dd..bfe3510 100644
--- a/libicui18n/manifest
+++ b/libicui18n/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicui18n
-version: 65.1.0+1
+version: 65.1.0+2
 upstream-version: 65.1
 project: icu
 summary: ICU high-level internationalization C/C++ library
diff --git a/libicuio/libicuio/buildfile b/libicuio/libicuio/buildfile
index 2fc6f89..8d5da32 100644
--- a/libicuio/libicuio/buildfile
+++ b/libicuio/libicuio/buildfile
@@ -42,8 +42,7 @@ switch $tclass, $tsys
 
 cxx.poptions =+ "-I$src_base/io"
 
-if $windows
-  obja{*}: cxx.poptions += -DU_STATIC_IMPLEMENTATION
+obja{*}: cxx.poptions += -DU_STATIC_IMPLEMENTATION
 
 switch $cxx.class, $tsys
 {
@@ -95,6 +94,8 @@ lib{icuio}:
   cc.export.libs     = $int_libs
 }
 
+liba{icuio}: cc.export.poptions += -DU_STATIC_IMPLEMENTATION
+
 # See bootstrap.build for details.
 #
 if $version.pre_release
diff --git a/libicuio/manifest b/libicuio/manifest
index ac83b46..f7c3435 100644
--- a/libicuio/manifest
+++ b/libicuio/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuio
-version: 65.1.0+1
+version: 65.1.0+2
 upstream-version: 65.1
 project: icu
 summary: ICU input/output C/C++ library
diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile
index b54b35b..0730410 100644
--- a/libicuuc/libicu/buildfile
+++ b/libicuuc/libicu/buildfile
@@ -61,8 +61,7 @@ switch $tclass, $tsys
 
 cc.poptions =+ "-I$src_root" "-I$src_base/uc"
 
-if $windows
-  obja{*}: cc.poptions += -DU_STATIC_IMPLEMENTATION
+obja{*}: cc.poptions += -DU_STATIC_IMPLEMENTATION
 
 switch $c.class, $tsys
 {
@@ -147,7 +146,8 @@ switch $tclass, $tsys
 # We don't export libicudata since it is not of much use to anyone except
 # libicuuc.
 #
-lib{icuuc}: cc.export.poptions = "-I$src_base/uc"
+lib{icuuc}:  cc.export.poptions  = "-I$src_base/uc"
+liba{icuuc}: cc.export.poptions += -DU_STATIC_IMPLEMENTATION
 
 # See bootstrap.build for details.
 #
diff --git a/libicuuc/manifest b/libicuuc/manifest
index a4fa09a..1123dfe 100644
--- a/libicuuc/manifest
+++ b/libicuuc/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libicuuc
-version: 65.1.0+1
+version: 65.1.0+2
 upstream-version: 65.1
 project: icu
 summary: ICU basic internationalization C/C++ library
-- 
cgit v1.1