From 5c33d1b7380436104053d93cbff98eef88fb4f1b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 5 Jul 2023 15:41:58 +0300 Subject: Release version 65.1.0+8 Suppress some Clang and MSVC warnings. Fix dist operation 'multiple files are distributed as ...' warning. --- libicuuc/libicu/buildfile | 16 +++++++++++----- libicuuc/manifest | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'libicuuc') diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile index ce96b5b..ca8e05c 100644 --- a/libicuuc/libicu/buildfile +++ b/libicuuc/libicu/buildfile @@ -5,7 +5,13 @@ patched = putil ucasemap uniset unistr -lib{icuuc}: uc/hxx{**} uc/cxx{* -{$patched}} cxx{$patched} lib{icudata} +# Note that some of the uc/unicode/*.h files are C++ headers and some are C +# headers. We will assume all of them as C headers, which is a bit of a hack +# but doing it properly is too painful. +# +lib{icuuc}: uc/hxx{** -unicode/*} uc/unicode/h{*} \ + uc/cxx{* -{$patched}} cxx{$patched} \ + lib{icudata} lib{icudata}: data/{h c}{*} uc/unicode/h{*} @@ -69,7 +75,7 @@ switch $c.class { case 'gcc' { - cc.coptions += -fvisibility=hidden + cc.coptions += -fvisibility=hidden # 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 @@ -167,6 +173,6 @@ else # Install headers from the uc/unicode/ subdirectory only. # -h{*}: install = false -hxx{*}: install = false -uc/unicode/hxx{*}: install = include/unicode/ +h{*}: install = false +hxx{*}: install = false +uc/unicode/h{*}: install = include/unicode/ diff --git a/libicuuc/manifest b/libicuuc/manifest index 317dbfc..5350fe2 100644 --- a/libicuuc/manifest +++ b/libicuuc/manifest @@ -1,6 +1,6 @@ : 1 name: libicuuc -version: 65.1.0+7 +version: 65.1.0+8 upstream-version: 65.1 project: icu summary: ICU basic internationalization C/C++ library -- cgit v1.1