From cc2151f5126de4d3dda499405dc5985679763ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 14 Aug 2017 20:47:30 +0200 Subject: [PATCH] botan: fix cross targets --- srcpkgs/botan/template | 81 +++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index f2d2d675987..26b38b8363a 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -13,46 +13,77 @@ homepage="http://botan.randombit.net/" distfiles="http://botan.randombit.net/releases/Botan-${version}.tgz" checksum=c794db2ec46f6ff88f37ae76825f0c258f07880b865b6707b26acfcc4567b824 -case "$XBPS_TARGET_MACHINE" in - arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/4242/steps/shell_3/logs/stdio" -esac - LDFLAGS="-pthread" do_configure() { - local _arch _cpu _march _tune + local _args _arch _cpu _march _tune + + _args="--prefix=/usr" + _args+=" --os=linux" + _args+=" --cc=gcc" + _args+=" --cc-bin=$CXX" + _args+=" --with-doxygen" + _args+=" --with-openssl" + _args+=" --with-bzip2" + _args+=" --with-lzma" + _args+=" --with-zlib" + _args+=" --with-sqlite3" + _args+=" --enable-shared" + case "$XBPS_TARGET_MACHINE" in i686*) - _cpu="i686"; _arch="x86"; _march="i686"; _tune="i686" ;; + _cpu="i686" + _arch="x86" + _march="i686" + _tune="i686" + ;; x86_64*) - _cpu="x86_64"; _arch="x86"; _march="x86_64"; _tune="generic" ;; + _cpu="x86_64" + _arch="x86" + _march="x86_64" + _tune="generic" + ;; armv5*) - _cpu="armv5"; _arch="armv5te"; _march="armv5te" ;; + _cpu="armv5" + _arch="armv5te" + _march="armv5te" + _args+=" --disable-modules=simd" + ;; armv6*) - _cpu="armv6"; _arch="armv6"; _march="armv6" ;; + _cpu="armv6" + _arch="armv6" + _march="armv6" + _args+=" --disable-modules=simd" + ;; armv7*) - _cpu="armv7-a"; _arch="armv7"; _march="armv7-a" ;; + _cpu="armv7-a" + _arch="armv7" + _march="armv7-a" + _args+=" --disable-modules=simd" + ;; aarch64*) - _cpu="armv8-a"; _arch="arm64"; _march="armv8-a" ;; + _cpu="armv8-a" + _arch="arm64" + _march="armv8-a" + ;; mipselhf*) - _cpu="mips32"; _arch="mips"; _march="mips32"; _mtune="mips32r2 --hard-float" ;; + _cpu="mips32" + _arch="mips" + _march="mips32" + _mtune="mips32r2 --hard-float" + ;; mips*) - _cpu="mips32"; _arch="mips"; _march="mips32"; _mtune="mips32r2 --soft-float" ;; + _cpu="mips32" + _arch="mips" + _march="mips32" + _mtune="mips32r2 --soft-float" + ;; esac + python configure.py \ - --prefix=/usr \ - --os=linux \ - --cc=gcc \ - --cc-bin=$CXX \ --cc-abi-flags="-arch ${_arch} -stdlib=libc++" \ - --cpu=$_cpu \ - --with-doxygen \ - --with-openssl \ - --with-bzip2 \ - --with-lzma \ - --with-zlib \ - --with-sqlite3 \ - --enable-shared + --cpu=${_cpu} \ + ${_args} sed -i Makefile \ -e"s;^\(CXX.*\)=.*;\1= $CXXFLAGS;" \