lapack: update to 3.7.0
This commit is contained in:
Alessio Sergi
parent
d2384639e5
commit
7a574dd735
|
|
@ -1,16 +1,14 @@
|
|||
diff --git BLAS/SRC/CMakeLists.txt BLAS/SRC/CMakeLists.txt
|
||||
index 7d8066c..841e28f 100644
|
||||
--- BLAS/SRC/CMakeLists.txt
|
||||
+++ BLAS/SRC/CMakeLists.txt
|
||||
@@ -137,6 +137,7 @@ endif()
|
||||
|
||||
|
||||
--- 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 @@
|
||||
|
||||
|
||||
add_library(blas ${ALLOBJ})
|
||||
+add_library(blas_static STATIC ${ALLOBJ})
|
||||
#if(UNIX)
|
||||
# target_link_libraries(blas m)
|
||||
#endif()
|
||||
@@ -145,5 +146,8 @@ set_target_properties(
|
||||
@@ -145,5 +146,8 @@
|
||||
VERSION ${LAPACK_VERSION}
|
||||
SOVERSION ${LAPACK_MAJOR_VERSION}
|
||||
)
|
||||
|
|
@ -19,57 +17,50 @@ index 7d8066c..841e28f 100644
|
|||
+target_link_libraries(blas_static)
|
||||
lapack_install_library(blas)
|
||||
+lapack_install_library(blas_static)
|
||||
diff --git CBLAS/src/CMakeLists.txt CBLAS/src/CMakeLists.txt
|
||||
index 8093a5c..d4df765 100644
|
||||
--- CBLAS/src/CMakeLists.txt
|
||||
+++ CBLAS/src/CMakeLists.txt
|
||||
@@ -164,5 +164,9 @@ if (CBLAS_COMPLEX16)
|
||||
endif(CBLAS_COMPLEX16)
|
||||
--- 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})
|
||||
-target_link_libraries(cblas ${BLAS_LIBRARIES} )
|
||||
+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 ${BLAS_LIBRARIES})
|
||||
+target_link_libraries(cblas_static ${BLAS_LIBRARIES})
|
||||
lapack_install_library(cblas)
|
||||
+lapack_install_library(cblas_static)
|
||||
diff --git LAPACKE/CMakeLists.txt LAPACKE/CMakeLists.txt
|
||||
index 008f24c..807ebf0 100644
|
||||
--- LAPACKE/CMakeLists.txt
|
||||
+++ LAPACKE/CMakeLists.txt
|
||||
@@ -46,18 +46,26 @@ append_subdir_files(UTILS_OBJ "utils")
|
||||
--- 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 (USE_XBLAS)
|
||||
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 (LAPACKE_WITH_TMG)
|
||||
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(LAPACKE_WITH_TMG)
|
||||
endif(USE_XBLAS)
|
||||
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} DESTINATION include )
|
||||
install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include)
|
||||
|
||||
if(BUILD_TESTING)
|
||||
diff --git SRC/CMakeLists.txt SRC/CMakeLists.txt
|
||||
index 03441b9..e6a381b 100644
|
||||
--- SRC/CMakeLists.txt
|
||||
+++ SRC/CMakeLists.txt
|
||||
@@ -455,6 +455,7 @@ endif()
|
||||
--- 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})
|
||||
|
|
@ -77,11 +68,10 @@ index 03441b9..e6a381b 100644
|
|||
target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
|
||||
|
||||
set_target_properties(
|
||||
@@ -462,5 +463,7 @@ set_target_properties(
|
||||
VERSION ${LAPACK_VERSION}
|
||||
@@ -523,4 +524,6 @@
|
||||
SOVERSION ${LAPACK_MAJOR_VERSION}
|
||||
)
|
||||
+set_target_properties(lapack_static PROPERTIES OUTPUT_NAME lapack)
|
||||
|
||||
+set_target_properties(lapack_static PROPERTIES OUTPUT_NAME lapack)
|
||||
lapack_install_library(lapack)
|
||||
+lapack_install_library(lapack_static)
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
diff --git CBLAS/CMakeLists.txt CBLAS/CMakeLists.txt
|
||||
index 98b481f..1c9428e 100644
|
||||
--- CBLAS/CMakeLists.txt
|
||||
+++ CBLAS/CMakeLists.txt
|
||||
@@ -87,4 +87,8 @@ install(FILES
|
||||
--- CBLAS/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
|
||||
+++ CBLAS/CMakeLists.txt 2017-01-26 15:24:38.039693320 +0100
|
||||
@@ -81,5 +81,11 @@
|
||||
DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION}
|
||||
)
|
||||
|
||||
#install(EXPORT cblas-targets
|
||||
# DESTINATION lib/cmake/cblas-${LAPACK_VERSION})
|
||||
-
|
||||
+set_target_properties(
|
||||
+ cblas PROPERTIES
|
||||
+ VERSION ${LAPACK_VERSION}
|
||||
+ SOVERSION ${LAPACK_MAJOR_VERSION}
|
||||
+ )
|
||||
diff --git LAPACKE/CMakeLists.txt LAPACKE/CMakeLists.txt
|
||||
index 008f24c..e2cd9e0 100644
|
||||
--- LAPACKE/CMakeLists.txt
|
||||
+++ LAPACKE/CMakeLists.txt
|
||||
@@ -86,3 +86,9 @@ install(FILES
|
||||
|
||||
install(EXPORT lapacke-targets
|
||||
DESTINATION lib/cmake/lapacke-${LAPACK_VERSION})
|
||||
+
|
||||
#install(EXPORT cblas-targets
|
||||
# DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION})
|
||||
--- LAPACKE/CMakeLists.txt.orig 2016-12-24 00:01:32.000000000 +0100
|
||||
+++ LAPACKE/CMakeLists.txt 2017-01-26 15:26:04.446690679 +0100
|
||||
@@ -81,5 +81,11 @@
|
||||
DESTINATION ${LIBRARY_DIR}/cmake/lapacke-${LAPACK_VERSION}
|
||||
)
|
||||
|
||||
+set_target_properties(
|
||||
+ lapacke PROPERTIES
|
||||
+ VERSION ${LAPACK_VERSION}
|
||||
+ SOVERSION ${LAPACK_MAJOR_VERSION}
|
||||
+ )
|
||||
+
|
||||
install(EXPORT lapacke-targets
|
||||
DESTINATION ${LIBRARY_DIR}/cmake/lapacke-${LAPACK_VERSION})
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
diff --git BLAS/CMakeLists.txt BLAS/CMakeLists.txt
|
||||
--- BLAS/CMakeLists.txt
|
||||
+++ BLAS/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@
|
||||
if(BUILD_TESTING)
|
||||
add_subdirectory(TESTING)
|
||||
endif(BUILD_TESTING)
|
||||
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
|
||||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/blas.pc
|
||||
DESTINATION ${PKG_CONFIG_DIR}
|
||||
diff --git BLAS/blas.pc.in BLAS/blas.pc.in
|
||||
--- BLAS/blas.pc.in
|
||||
+++ BLAS/blas.pc.in
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@prefix@
|
||||
libdir=@libdir@
|
||||
|
||||
-Name: blas
|
||||
+Name: BLAS
|
||||
Description: Basic Linear Algebra Subprograms F77 reference implementations
|
||||
Version: @LAPACK_VERSION@
|
||||
URL: http://www.netlib.org/blas/
|
||||
diff --git CBLAS/CMakeLists.txt CBLAS/CMakeLists.txt
|
||||
--- CBLAS/CMakeLists.txt
|
||||
+++ CBLAS/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@
|
||||
${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
|
||||
|
||||
|
||||
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
|
||||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
|
||||
DESTINATION ${PKG_CONFIG_DIR}
|
||||
diff --git CBLAS/cblas.pc.in CBLAS/cblas.pc.in
|
||||
--- CBLAS/cblas.pc.in
|
||||
+++ CBLAS/cblas.pc.in
|
||||
@@ -1,9 +1,9 @@
|
||||
prefix=@prefix@
|
||||
libdir=@libdir@
|
||||
|
||||
-Name: lapacke
|
||||
-Description: C Standard Interface to BLAS Linear Algebra PACKage
|
||||
+Name: CBLAS
|
||||
+Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
|
||||
Version: @LAPACK_VERSION@
|
||||
-URL: http://www.netlib.org/lapack/
|
||||
+URL: http://www.netlib.org/blas/#_cblas
|
||||
Libs: -L${libdir} -lcblas
|
||||
Requires: blas
|
||||
diff --git CMakeLists.txt CMakeLists.txt
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -112,6 +112,13 @@
|
||||
set(DSECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
|
||||
set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
|
||||
|
||||
+set(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
+if(NOT IS_ABSOLUTE ${LIBRARY_DIR})
|
||||
+ set(libdir "\${prefix}/${LIBRARY_DIR}")
|
||||
+else()
|
||||
+ set(libdir "${LIBRARY_DIR}")
|
||||
+endif()
|
||||
+
|
||||
# --------------------------------------------------
|
||||
# Precision to build
|
||||
# By default all precisions are generated
|
||||
@@ -333,7 +340,7 @@
|
||||
${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
|
||||
|
||||
|
||||
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
|
||||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
|
||||
DESTINATION ${PKG_CONFIG_DIR}
|
||||
diff --git LAPACKE/CMakeLists.txt LAPACKE/CMakeLists.txt
|
||||
--- LAPACKE/CMakeLists.txt
|
||||
+++ LAPACKE/CMakeLists.txt
|
||||
@@ -65,7 +65,7 @@
|
||||
endif(BUILD_TESTING)
|
||||
|
||||
|
||||
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
|
||||
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
|
||||
DESTINATION ${PKG_CONFIG_DIR}
|
||||
diff --git LAPACKE/lapacke.pc.in LAPACKE/lapacke.pc.in
|
||||
--- LAPACKE/lapacke.pc.in
|
||||
+++ LAPACKE/lapacke.pc.in
|
||||
@@ -1,9 +1,9 @@
|
||||
prefix=@prefix@
|
||||
libdir=@libdir@
|
||||
|
||||
-Name: lapacke
|
||||
+Name: LAPACKE
|
||||
Description: C Standard Interface to LAPACK Linear Algebra PACKage
|
||||
Version: @LAPACK_VERSION@
|
||||
-URL: http://www.netlib.org/lapack/
|
||||
+URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
|
||||
Libs: -L${libdir} -llapacke
|
||||
Requires: lapack blas
|
||||
diff --git lapack.pc.in lapack.pc.in
|
||||
--- lapack.pc.in
|
||||
+++ lapack.pc.in
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@prefix@
|
||||
libdir=@libdir@
|
||||
|
||||
-Name: lapack
|
||||
+Name: LAPACK
|
||||
Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
|
||||
Version: @LAPACK_VERSION@
|
||||
URL: http://www.netlib.org/lapack/
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'lapack'
|
||||
pkgname=lapack
|
||||
version=3.6.1
|
||||
version=3.7.0
|
||||
revision=1
|
||||
nocross=yes
|
||||
build_style=cmake
|
||||
|
|
@ -14,7 +14,7 @@ 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=888a50d787a9d828074db581c80b2d22bdb91435a673b1bf6cd6eb51aa50d1de
|
||||
checksum=ed967e4307e986474ab02eb810eed1d1adc73f5e1e3bc78fb009f6fe766db3be
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
|
|||
Loading…
Reference in New Issue