jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lapack: update to 3.7.1

Browse source
This commit is contained in:
Alessio Sergi 2017-06-29 02:29:29 +02:00
parent 4c1b8b573a
commit d833bb4c6f
2 changed files with 91 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
srcpkgs/lapack/patches/cmake-make-both-static-shared.patch
View file

@ -1,77 +1,100 @@
--- BLAS/SRC/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
+++ BLAS/SRC/CMakeLists.txt 2017-01-26 18:25:14.716987207 +0100
@@ -137,6 +137,7 @@
--- BLAS/SRC/CMakeLists.txt.orig 2017-06-18 00:46:53.000000000 +0200
+++ BLAS/SRC/CMakeLists.txt 2017-06-28 13:04:20.081282712 +0200
@@ -98,9 +98,15 @@
list(REMOVE_DUPLICATES SOURCES)
add_library(blas ${ALLOBJ})
+add_library(blas_static STATIC ${ALLOBJ})
#if(UNIX)
# target_link_libraries(blas m)
#endif()
@@ -145,5 +146,8 @@
add_library(blas ${SOURCES})
+add_library(blas_static STATIC ${SOURCES})
set_target_properties(
blas PROPERTIES
VERSION ${LAPACK_VERSION}
SOVERSION ${LAPACK_MAJOR_VERSION}
)
+set_target_properties(blas_static PROPERTIES OUTPUT_NAME blas)
target_link_libraries(blas)
+target_link_libraries(blas_static)
+set_target_properties(
+ blas_static PROPERTIES
+ OUTPUT_NAME blas
+ )
lapack_install_library(blas)
+lapack_install_library(blas_static)
--- CBLAS/src/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
+++ CBLAS/src/CMakeLists.txt 2017-01-26 16:05:18.432375726 +0100
@@ -166,5 +166,9 @@
endif()
add_library(cblas ${ALLOBJ})
+add_library(cblas_static STATIC ${ALLOBJ})
+set_target_properties(cblas_static PROPERTIES OUTPUT_NAME cblas)
target_link_libraries(cblas ${BLAS_LIBRARIES})
+target_link_libraries(cblas_static ${BLAS_LIBRARIES})
lapack_install_library(cblas)
+lapack_install_library(cblas_static)
--- LAPACKE/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
+++ LAPACKE/CMakeLists.txt 2017-01-26 16:13:03.367980751 +0100
@@ -43,18 +43,26 @@
if(USE_XBLAS)
add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+ add_library(lapacke_static STATIC ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ target_link_libraries(lapacke_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
else()
if(LAPACKE_WITH_TMG)
add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+ add_library(lapacke_static STATIC ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ target_link_libraries(lapacke_static tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
else()
add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+ add_library(lapacke_static STATIC ${SRC_OBJ} ${UTILS_OBJ})
target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ target_link_libraries(lapacke_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
endif()
endif()
+set_target_properties(lapacke_static PROPERTIES OUTPUT_NAME lapacke)
lapack_install_library(lapacke)
+lapack_install_library(lapacke_static)
install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include)
if(BUILD_TESTING)
--- SRC/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
+++ SRC/CMakeLists.txt 2017-01-26 18:31:08.341883848 +0100
@@ -515,6 +515,7 @@
list(REMOVE_DUPLICATES ALLOBJ)
add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+add_library(lapack_static STATIC ${ALLOBJ} ${ALLXOBJ})
target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
--- 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 @@
list(REMOVE_DUPLICATES SOURCES)
add_library(cblas ${SOURCES})
+add_library(cblas_static STATIC ${SOURCES})
set_target_properties(
@@ -523,4 +524,6 @@
cblas PROPERTIES
LINKER_LANGUAGE C
VERSION ${LAPACK_VERSION}
SOVERSION ${LAPACK_MAJOR_VERSION}
)
+set_target_properties(
+ cblas_static PROPERTIES
+ OUTPUT_NAME cblas
+ )
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 @@
list(APPEND SOURCES ${UTILS})
add_library(lapacke ${SOURCES})
+add_library(lapacke_static STATIC ${SOURCES})
set_target_properties(
lapacke PROPERTIES
LINKER_LANGUAGE C
VERSION ${LAPACK_VERSION}
SOVERSION ${LAPACK_MAJOR_VERSION}
)
+set_target_properties(
+ lapacke_static PROPERTIES
+ OUTPUT_NAME lapacke
+ )
if(LAPACKE_WITH_TMG)
target_link_libraries(lapacke PRIVATE tmglib)
+ target_link_libraries(lapacke_static PRIVATE tmglib)
endif()
target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
+target_link_libraries(lapacke_static PRIVATE ${LAPACK_LIBRARIES})
lapack_install_library(lapacke)
+lapack_install_library(lapacke_static)
install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if(BUILD_TESTING)
--- SRC/CMakeLists.txt.orig 2017-06-18 00:46:53.000000000 +0200
+++ SRC/CMakeLists.txt 2017-06-28 13:24:03.571549842 +0200
@@ -487,16 +487,23 @@
list(REMOVE_DUPLICATES SOURCES)
add_library(lapack ${SOURCES})
+add_library(lapack_static STATIC ${SOURCES})
set_target_properties(
lapack PROPERTIES
VERSION ${LAPACK_VERSION}
SOVERSION ${LAPACK_MAJOR_VERSION}
)
+set_target_properties(
+ lapack_static PROPERTIES
+ OUTPUT_NAME lapack
+ )
if(USE_XBLAS)
target_link_libraries(lapack PRIVATE ${XBLAS_LIBRARY})
+ target_link_libraries(lapack_static PRIVATE ${XBLAS_LIBRARY})
endif()
target_link_libraries(lapack PRIVATE ${BLAS_LIBRARIES})
+target_link_libraries(lapack_static PRIVATE ${BLAS_LIBRARIES})
if (${CMAKE_BUILD_TYPE_UPPER} STREQUAL "COVERAGE")
target_link_libraries(lapack PRIVATE gcov)
@@ -504,3 +511,4 @@
endif()
+set_target_properties(lapack_static PROPERTIES OUTPUT_NAME lapack)
lapack_install_library(lapack)
+lapack_install_library(lapack_static)

10
srcpkgs/lapack/template
View file

@ -1,19 +1,17 @@
# Template file for 'lapack'
pkgname=lapack
version=3.7.0
version=3.7.1
revision=1
build_style=cmake
configure_args="
-DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTING=OFF
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_Fortran_COMPILER=$FC
-DCMAKE_Fortran_FLAGS=-fPIC -DCBLAS=ON -DLAPACKE=ON -DBUILD_DEPRECATED=ON"
configure_args="-DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTING=OFF
-DCMAKE_VERBOSE_MAKEFILE=ON -DCBLAS=ON -DLAPACKE=ON -DBUILD_DEPRECATED=ON"
hostmakedepends="gcc-fortran"
short_desc="Linear Algebra PACKage"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="http://www.netlib.org/lapack/"
license="3-clause-BSD"
distfiles="http://www.netlib.org/${pkgname}/${pkgname}-${version}.tgz"
checksum=ed967e4307e986474ab02eb810eed1d1adc73f5e1e3bc78fb009f6fe766db3be
checksum=1af2e1aa940eb72c4154f3a1072418b922d1d163c1bc322de5171d9aaa715b79
post_install() {
vlicense LICENSE