diff --git a/common/shlibs b/common/shlibs index 688275b7d9..054cebbb65 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2703,7 +2703,7 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libbotan-2.so.10 botan-2.10.0_1 +libbotan-2.so.12 botan-2.12.0_1 libswipl.so.8 swi-prolog-8.0.0_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 0d2f002139..e479746cc7 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan -version=2.10.0 -revision=2 +version=2.12.0 +revision=1 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile pycompile_module="botan.py" @@ -11,8 +11,8 @@ short_desc="Crypto library written in C++" maintainer="Jürgen Buchmüller " license="BSD-2-Clause" homepage="https://botan.randombit.net/" -distfiles="https://botan.randombit.net/releases/Botan-${version}.tgz" -checksum=88481997578c27924724fea76610d43d9f59c99edfe561d41803bbc98871ad31 +distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz" +checksum=1eaefd459d52f27de1805cff8c68792e0610919648ee98e101980e94edb90a63 python_version=2 @@ -20,7 +20,7 @@ LDFLAGS="-pthread" CXXFLAGS="-O3" do_configure() { - local _args _arch _cpu + local _args _cpu _args="--prefix=/usr" _args+=" --os=linux" @@ -36,48 +36,44 @@ do_configure() { case "$XBPS_TARGET_MACHINE" in i686*) _cpu="i686" - _arch="x86" ;; x86_64*) _cpu="x86_64" - _arch="x86" ;; armv5*) _cpu="arm" - _arch="armv5te" _args+=" --disable-modules=simd" ;; armv6*) _cpu="arm" - _arch="armv6" _args+=" --disable-modules=simd" ;; armv7*) _cpu="armv7-a" - _arch="armv7" _args+=" --disable-modules=simd" ;; aarch64*) _cpu="armv8-a" - _arch="arm64" ;; mips*) _cpu="mips32" - _arch="mips" ;; ppc64le*) _cpu="ppc64le" - _arch="ppc64le" ;; ppc64*) _cpu="ppc64" - _arch="ppc64" + ;; + ppc*) + _cpu="ppc" + ;; + *) + _cpu="${XBPS_TARGET_MACHINE%-musl}" ;; esac python2 configure.py \ --distribution-info="Void Linux botan-${version}_${revision}" \ - --cc-abi-flags="-std=c++14" \ --cpu=${_cpu} \ ${_args} }