From f3ddc1b9d184d111407d88480e9fb8d06ed7eeb9 Mon Sep 17 00:00:00 2001 From: Gabriele Baldassarre Date: Wed, 3 Jun 2020 23:51:44 +0200 Subject: [PATCH] armadillo: bump to 9.880.3 (#5061) --- ....800.3.recipe => armadillo-9.880.1.recipe} | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) rename sci-libs/armadillo/{armadillo-9.800.3.recipe => armadillo-9.880.1.recipe} (81%) diff --git a/sci-libs/armadillo/armadillo-9.800.3.recipe b/sci-libs/armadillo/armadillo-9.880.1.recipe similarity index 81% rename from sci-libs/armadillo/armadillo-9.800.3.recipe rename to sci-libs/armadillo/armadillo-9.880.1.recipe index d94410ee2..65ef6bc52 100644 --- a/sci-libs/armadillo/armadillo-9.800.3.recipe +++ b/sci-libs/armadillo/armadillo-9.880.1.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2008-2019 Conrad Sanderson LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/arma/armadillo-$portVersion.tar.xz" -CHECKSUM_SHA256="a481e1dc880b7cb352f8a28b67fe005dc1117d4341277f12999a2355d40d7599" +CHECKSUM_SHA256="900f3e8d35d8b722217bed979fa618faf6f3e4f56964c887a1fce44c3d4c4b9f" SOURCE_DIR="armadillo-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -64,6 +64,12 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage armadillo$secondaryArchSuffix \ "$libDir"/libarmadillo.so.$libVersion +PATCH() +{ + # Enable some optional features + sed --regexp-extended -i '/ARMA_USE_(SUPERLU|ARPACK)/s/^\/\///g' include/armadillo_bits/config.hpp +} + BUILD() { mkdir -p build && cd "$_" @@ -99,7 +105,12 @@ INSTALL() TEST() { - #make test - # Armadillo provides no tests through cmake AFAIK - true + export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build + export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$sourceDir/include + + sed -i "s|LIB_FLAGS = -larmadillo|LIB_FLAGS = -lopenblas -llapack -larpack -lsuperlu -larmadillo -L$sourceDir/build|g" tests/Makefile + + make -C tests all $jobArgs + + ./tests/main }