[clapack] 01/02: Create shared and static libs at the same time

Andreas Tille tille at debian.org
Sat May 21 15:13:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository clapack.

commit 898fe199d19875429f49f1148c9656e0d2dfae37
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 21 16:28:04 2016 +0200

    Create shared and static libs at the same time
---
 debian/patches/create_shared_libs.patch | 48 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/create_shared_libs.patch b/debian/patches/create_shared_libs.patch
new file mode 100644
index 0000000..62cacd0
--- /dev/null
+++ b/debian/patches/create_shared_libs.patch
@@ -0,0 +1,48 @@
+--- a/BLAS/SRC/CMakeLists.txt
++++ b/BLAS/SRC/CMakeLists.txt
+@@ -136,8 +136,9 @@ if(BLAS_COMPLEX16)
+ endif()
+   
+   
+-add_library(blas ${ALLOBJ})
++add_library(cblas SHARED ${ALLOBJ})
++add_library(cblasstatic STATIC ${ALLOBJ})
+ if(UNIX)
+-  target_link_libraries(blas m)
++  target_link_libraries(cblas m)
+ endif()
+-target_link_libraries(blas f2c)
++target_link_libraries(cblas f2c)
+--- a/F2CLIBS/libf2c/CMakeLists.txt
++++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -58,5 +58,6 @@ if(WIN32)
+ endif()
+ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
+ include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
+-add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
++add_library(f2c SHARED ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
++add_library(f2cstatic STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
+ set_property(TARGET f2c PROPERTY PREFIX lib)
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -375,6 +375,7 @@ endif()
+ if(BUILD_COMPLEX16)
+   set(ALLOBJ  ${ZLASRC} ${ALLAUX} ${DZLAUX})
+ endif()
+-add_library(lapack ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(lapack blas)
++add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
++add_library(clapackstatic STATIC ${ALLOBJ} ${ALLXOBJ})
++target_link_libraries(clapack cblas)
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+ set(CPACK_PACKAGE_VERSION_MINOR 2)
+ set(CPACK_PACKAGE_VERSION_PATCH 1)
+ include(CPack)
+-export(TARGETS f2c blas lapack FILE clapack-targets.cmake)
++export(TARGETS f2c cblas cblasstatic clapack clapackstatic FILE clapack-targets.cmake)
+ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in
+   ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
+ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
diff --git a/debian/patches/series b/debian/patches/series
index 4639c2c..5d071d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 format-security.patch
 skip_tests_triggering_stack_overflow.patch
+create_shared_libs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clapack.git



More information about the debian-science-commits mailing list