diff --git a/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch b/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch index 94bf7e591ff..96d883597db 100644 --- a/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch +++ b/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch @@ -16,9 +16,9 @@ + ) lapack_install_library(blas) +lapack_install_library(blas_static) ---- CBLAS/src/CMakeLists.txt.orig 2017-06-18 00:46:53.000000000 +0200 -+++ CBLAS/src/CMakeLists.txt 2017-06-28 13:16:16.072974557 +0200 -@@ -114,11 +114,18 @@ +--- CBLAS/src/CMakeLists.txt.orig 2017-11-13 05:15:54.000000000 +0100 ++++ CBLAS/src/CMakeLists.txt 2018-01-16 11:56:01.647337846 +0100 +@@ -114,15 +114,22 @@ list(REMOVE_DUPLICATES SOURCES) add_library(cblas ${SOURCES}) @@ -33,13 +33,17 @@ + cblas_static PROPERTIES + OUTPUT_NAME cblas + ) + target_include_directories(cblas PUBLIC + $ + $ + ) target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) +target_link_libraries(cblas_static PRIVATE ${BLAS_LIBRARIES}) lapack_install_library(cblas) +lapack_install_library(cblas_static) ---- LAPACKE/CMakeLists.txt.orig 2017-06-18 00:46:53.000000000 +0200 -+++ LAPACKE/CMakeLists.txt 2017-06-28 13:20:33.292989852 +0200 -@@ -54,19 +54,27 @@ +--- LAPACKE/CMakeLists.txt.orig 2017-11-13 05:15:54.000000000 +0100 ++++ LAPACKE/CMakeLists.txt 2018-01-16 11:58:08.345344106 +0100 +@@ -54,12 +54,17 @@ list(APPEND SOURCES ${UTILS}) add_library(lapacke ${SOURCES}) @@ -54,6 +58,10 @@ + lapacke_static PROPERTIES + OUTPUT_NAME lapacke + ) + target_include_directories(lapacke PUBLIC + $ + $ +@@ -67,10 +72,13 @@ if(LAPACKE_WITH_TMG) target_link_libraries(lapacke PRIVATE tmglib) diff --git a/srcpkgs/lapack/template b/srcpkgs/lapack/template index d0082dfc1bc..561a9a670b3 100644 --- a/srcpkgs/lapack/template +++ b/srcpkgs/lapack/template @@ -1,7 +1,7 @@ # Template file for 'lapack'. pkgname=lapack -version=3.7.1 -revision=3 +version=3.8.0 +revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCBLAS=ON -DLAPACKE=ON -DBUILD_DEPRECATED=ON" @@ -10,8 +10,8 @@ short_desc="Linear Algebra PACKage" maintainer="Alessio Sergi " homepage="http://www.netlib.org/lapack/" license="3-clause-BSD" -distfiles="http://www.netlib.org/${pkgname}/${pkgname}-${version}.tgz" -checksum=f6c53fd9f56932f3ddb3d5e24c1c07e4cd9b3b08e7f89de9c867125eecc9a1c8 +distfiles="http://www.netlib.org/lapack/lapack-${version}.tar.gz" +checksum=deb22cc4a6120bff72621155a9917f485f96ef8319ac074a7afbc68aab88bcf6 post_install() { vlicense LICENSE