From 29827fde524a42fe343b32ea3c2f543e9ed3ee55 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 15 Feb 2020 03:27:02 +0300 Subject: Release version 65.1.0+1 Drop copyright notice from source code Convert libicuuc test from C to C++ so it can link library statically Drop linking -lpthread and -lm for MinGW GCC --- libicuio/build/bootstrap.build | 1 - libicuio/build/export.build | 1 - libicuio/build/root.build | 1 - libicuio/buildfile | 1 - libicuio/libicuio/buildfile | 8 +++++--- libicuio/manifest | 2 +- libicuio/tests/basic/buildfile | 1 - libicuio/tests/basic/driver.cpp | 1 - libicuio/tests/basic/testscript | 1 - libicuio/tests/build/bootstrap.build | 1 - libicuio/tests/build/root.build | 3 +-- libicuio/tests/buildfile | 1 - 12 files changed, 7 insertions(+), 15 deletions(-) (limited to 'libicuio') diff --git a/libicuio/build/bootstrap.build b/libicuio/build/bootstrap.build index fd58532..ef574c9 100644 --- a/libicuio/build/bootstrap.build +++ b/libicuio/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file project = libicuio diff --git a/libicuio/build/export.build b/libicuio/build/export.build index 2559f4e..d40d387 100644 --- a/libicuio/build/export.build +++ b/libicuio/build/export.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file $out_root/ diff --git a/libicuio/build/root.build b/libicuio/build/root.build index aba4fb6..be5eaaf 100644 --- a/libicuio/build/root.build +++ b/libicuio/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file # Note that upstream compiles with -std=c++11 but this ends up with the 'auto diff --git a/libicuio/buildfile b/libicuio/buildfile index d929850..7aa0fe6 100644 --- a/libicuio/buildfile +++ b/libicuio/buildfile @@ -1,5 +1,4 @@ # file : buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file ./: {*/ -build/} doc{LICENSE INSTALL README} manifest diff --git a/libicuio/libicuio/buildfile b/libicuio/libicuio/buildfile index 90630f4..2fc6f89 100644 --- a/libicuio/libicuio/buildfile +++ b/libicuio/libicuio/buildfile @@ -1,5 +1,4 @@ # file : libicuio/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file import int_libs = libicui18n%lib{icui18n} @@ -76,8 +75,11 @@ switch $tclass, $tsys } case 'windows', 'mingw32' { - cxx.loptions += -Wl,-Bsymbolic -Wl,--enable-auto-import - cxx.libs += -lpthread -lm + # Note that we ommit -mthreads, -lpthread, and -lm that the upstream + # package also passes (see libicuuc/libicu/buildfile for details). + # + cxx.loptions += -Wl,-Bsymbolic -Wl,--enable-auto-import \ + -Wl,--no-undefined # Make sure all symbols are resolvable. } case 'windows' { diff --git a/libicuio/manifest b/libicuio/manifest index d424487..ac83b46 100644 --- a/libicuio/manifest +++ b/libicuio/manifest @@ -1,6 +1,6 @@ : 1 name: libicuio -version: 65.1.0 +version: 65.1.0+1 upstream-version: 65.1 project: icu summary: ICU input/output C/C++ library diff --git a/libicuio/tests/basic/buildfile b/libicuio/tests/basic/buildfile index df0f552..7104878 100644 --- a/libicuio/tests/basic/buildfile +++ b/libicuio/tests/basic/buildfile @@ -1,5 +1,4 @@ # file : tests/basic/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : Unicode License; see accompanying LICENSE file import libs = libicuio%lib{icuio} diff --git a/libicuio/tests/basic/driver.cpp b/libicuio/tests/basic/driver.cpp index 8c87b4b..ecb4887 100644 --- a/libicuio/tests/basic/driver.cpp +++ b/libicuio/tests/basic/driver.cpp @@ -1,5 +1,4 @@ // file : tests/basic/driver.cpp -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : Unicode License; see accompanying LICENSE file #include diff --git a/libicuio/tests/basic/testscript b/libicuio/tests/basic/testscript index 1d9ea51..8cf9a91 100644 --- a/libicuio/tests/basic/testscript +++ b/libicuio/tests/basic/testscript @@ -1,5 +1,4 @@ # file : tests/basic/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file $* <"Mitteleuropäische Sommerzeit" >>EOO diff --git a/libicuio/tests/build/bootstrap.build b/libicuio/tests/build/bootstrap.build index 17797c1..b689bd5 100644 --- a/libicuio/tests/build/bootstrap.build +++ b/libicuio/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file project = # Unnamed subproject. diff --git a/libicuio/tests/build/root.build b/libicuio/tests/build/root.build index e8283ae..76b5bd7 100644 --- a/libicuio/tests/build/root.build +++ b/libicuio/tests/build/root.build @@ -1,8 +1,7 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file -cxx.std = 14 +cxx.std = latest using cxx diff --git a/libicuio/tests/buildfile b/libicuio/tests/buildfile index d976635..78b2b2a 100644 --- a/libicuio/tests/buildfile +++ b/libicuio/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file ./: {*/ -build/} -- cgit v1.1