diff --git a/sci-libs/armadillo/armadillo-10.8.2.recipe b/sci-libs/armadillo/armadillo-10.8.2.recipe index d723a2101..47be42ebe 100644 --- a/sci-libs/armadillo/armadillo-10.8.2.recipe +++ b/sci-libs/armadillo/armadillo-10.8.2.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2008-2020 Conrad Sanderson 2017-2020 Arroyo Consortium 2017-2020 Data61, CSIRO" LICENSE="Apache v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://downloads.sourceforge.net/arma/armadillo-$portVersion.tar.xz" CHECKSUM_SHA256="89fdd898bf6bff75f6efc3a301817e4ede752b9a80927fb07ee358b13e353922" SOURCE_DIR="armadillo-$portVersion" @@ -30,6 +30,7 @@ REQUIRES=" lib:libhdf5$secondaryArchSuffix lib:liblapack$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix + lib:libsuperlu$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -72,21 +73,16 @@ PATCH() BUILD() { - mkdir -p build && cd "$_" - - cmake .. \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $cmakeDirArgs \ -DDETECT_HDF5=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - $cmakeDirArgs - - make $jobArgs + -DBUILD_SHARED_LIBS=ON + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install mkdir -p $libDir/cmake/ cp -r $dataDir/Armadillo/CMake/. $libDir/cmake/.