commit 233ebd7a2651bf147492bdf6f6b3433e2f74ddb9 Author: Danny Rawlins <contact@romster.me> Date: Mon Oct 25 01:46:56 2021 +1100 [notify] icu: 68.2 -> 69.1 breaking shared library name, relinking will be necessary, check with revdep for ports to rebuild after this update diff --git a/icu/.footprint b/icu/.footprint index f4b09d7ef..1a86a4aa2 100644 --- a/icu/.footprint +++ b/icu/.footprint @@ -203,30 +203,30 @@ drwxr-xr-x root/root usr/include/unicode/ -rw-r--r-- root/root usr/include/unicode/vtzone.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/icu/ -drwxr-xr-x root/root usr/lib/icu/68.2/ --rw-r--r-- root/root usr/lib/icu/68.2/Makefile.inc --rw-r--r-- root/root usr/lib/icu/68.2/pkgdata.inc +drwxr-xr-x root/root usr/lib/icu/69.1/ +-rw-r--r-- root/root usr/lib/icu/69.1/Makefile.inc +-rw-r--r-- root/root usr/lib/icu/69.1/pkgdata.inc lrwxrwxrwx root/root usr/lib/icu/Makefile.inc -> current/Makefile.inc -lrwxrwxrwx root/root usr/lib/icu/current -> 68.2 +lrwxrwxrwx root/root usr/lib/icu/current -> 69.1 lrwxrwxrwx root/root usr/lib/icu/pkgdata.inc -> current/pkgdata.inc -lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.68.2 -lrwxrwxrwx root/root usr/lib/libicudata.so.68 -> libicudata.so.68.2 --rwxr-xr-x root/root usr/lib/libicudata.so.68.2 -lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.68.2 -lrwxrwxrwx root/root usr/lib/libicui18n.so.68 -> libicui18n.so.68.2 --rwxr-xr-x root/root usr/lib/libicui18n.so.68.2 -lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.68.2 -lrwxrwxrwx root/root usr/lib/libicuio.so.68 -> libicuio.so.68.2 --rwxr-xr-x root/root usr/lib/libicuio.so.68.2 -lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.68.2 -lrwxrwxrwx root/root usr/lib/libicutest.so.68 -> libicutest.so.68.2 --rwxr-xr-x root/root usr/lib/libicutest.so.68.2 -lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.68.2 -lrwxrwxrwx root/root usr/lib/libicutu.so.68 -> libicutu.so.68.2 --rwxr-xr-x root/root usr/lib/libicutu.so.68.2 -lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.68.2 -lrwxrwxrwx root/root usr/lib/libicuuc.so.68 -> libicuuc.so.68.2 --rwxr-xr-x root/root usr/lib/libicuuc.so.68.2 +lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.69.1 +lrwxrwxrwx root/root usr/lib/libicudata.so.69 -> libicudata.so.69.1 +-rwxr-xr-x root/root usr/lib/libicudata.so.69.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.69.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so.69 -> libicui18n.so.69.1 +-rwxr-xr-x root/root usr/lib/libicui18n.so.69.1 +lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.69.1 +lrwxrwxrwx root/root usr/lib/libicuio.so.69 -> libicuio.so.69.1 +-rwxr-xr-x root/root usr/lib/libicuio.so.69.1 +lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.69.1 +lrwxrwxrwx root/root usr/lib/libicutest.so.69 -> libicutest.so.69.1 +-rwxr-xr-x root/root usr/lib/libicutest.so.69.1 +lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.69.1 +lrwxrwxrwx root/root usr/lib/libicutu.so.69 -> libicutu.so.69.1 +-rwxr-xr-x root/root usr/lib/libicutu.so.69.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.69.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so.69 -> libicuuc.so.69.1 +-rwxr-xr-x root/root usr/lib/libicuuc.so.69.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/icu-i18n.pc -rw-r--r-- root/root usr/lib/pkgconfig/icu-io.pc @@ -240,12 +240,12 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/icupkg drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/icu/ -drwxr-xr-x root/root usr/share/icu/68.2/ --rw-r--r-- root/root usr/share/icu/68.2/LICENSE -drwxr-xr-x root/root usr/share/icu/68.2/config/ --rw-r--r-- root/root usr/share/icu/68.2/config/mh-linux --rwxr-xr-x root/root usr/share/icu/68.2/install-sh --rwxr-xr-x root/root usr/share/icu/68.2/mkinstalldirs +drwxr-xr-x root/root usr/share/icu/69.1/ +-rw-r--r-- root/root usr/share/icu/69.1/LICENSE +drwxr-xr-x root/root usr/share/icu/69.1/config/ +-rw-r--r-- root/root usr/share/icu/69.1/config/mh-linux +-rwxr-xr-x root/root usr/share/icu/69.1/install-sh +-rwxr-xr-x root/root usr/share/icu/69.1/mkinstalldirs drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/derb.1.gz diff --git a/icu/.signature b/icu/.signature index b8de65902..06a0f82de 100644 --- a/icu/.signature +++ b/icu/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fAxS0YqYVLhkqDX5muF4cpezPslC1+cTJ53vAZd/Dx9RdiYtwyU2nnlsJAMoF5o0hewBIu/XrhUrdZiIOZ4OwQ= -SHA256 (Pkgfile) = 60ecb514f0c145c2b9c2db7aa957e754188938cd4532229975486647effc3bb6 +RWSE3ohX2g5d/YGRgajID9r2ku+f7uZQ1PsXr/j2tKiHAC0pQofkNF8Zj+nhfiT82161pcw0QqSJm8GNWEr6UPxvdgZ6+62h5AY= +SHA256 (Pkgfile) = c5bed552b3300695893e9503d47169e76c438a370e173846ac1ace6490649a6b SHA256 (.footprint) = 25c4fb124d13db50566fba00b981459eb32bf59e8b3dc9a37cbec1deb5ff8de5 -SHA256 (icu4c-68_2-src.tgz) = c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625 +SHA256 (icu4c-69_1-src.tgz) = 4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 diff --git a/icu/Pkgfile b/icu/Pkgfile index b5d1ffba3..027a51a46 100644 --- a/icu/Pkgfile +++ b/icu/Pkgfile @@ -1,18 +1,20 @@ # Description: Widely used set of C/C++ libraries providing Unicode and Globalization support. -# URL: http://site.icu-project.org/ +# URL: https://icu.unicode.org # Maintainer: Danny Rawlins, crux at romster dot me +# Optional: clang lld name=icu -version=68.2 +version=69.1 release=1 source=(https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version/./_}-src.tgz) build() { cd icu/source - # icu tries to use clang by default - [ "$CC" ] || export CC=gcc - [ "$CXX" ] || export CXX=g++ + # icu tries to use clang by default, only do so if installed + prt-get isinst clang lld && LDFLAGS+=' -fuse-ld=lld -flto=thin' + prt-get isinst clang && export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib || \ + export CC=gcc CXX=g++ ./configure \ --prefix=/usr \