[med-svn] [Git][med-team/savvy][master] Make sure libzstd will be linked

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / savvy


Commits:
26f8f095 by Andreas Tille at 2022-09-22T11:42:47+02:00
Make sure libzstd will be linked

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/enable_zstd.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,5 @@
 savvy (2.1.0-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #<bug>)
-  Needs: https://github.com/jonathonl/shrinkwrap
 
  -- Andreas Tille <tille at debian.org>  Thu, 22 Sep 2022 10:06:27 +0200


=====================================
debian/control
=====================================
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper-compat (= 13),
-               cmake
+               cmake,
+               libshrinkwrap-dev,
+               libzstd-dev
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/med-team/savvy
 Vcs-Git: https://salsa.debian.org/med-team/savvy.git


=====================================
debian/patches/enable_zstd.patch
=====================================
@@ -0,0 +1,27 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 22 Sep 2022 10:06:27 +0200
+Description: Make sure libzstd will be linked
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,8 +29,8 @@ endif()
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;${CMAKE_FIND_LIBRARY_SUFFIXES}") # Prefer libz.a when both are available
+ #endif()
+ 
+-#find_library(ZLIB_LIBRARY z)
+-#find_library(ZSTD_LIBRARY zstd)
++find_library(ZLIB_LIBRARY z)
++find_library(ZSTD_LIBRARY zstd)
+ find_package(shrinkwrap REQUIRED)
+ find_package(Threads)
+ 
+@@ -58,7 +58,8 @@ add_library(savvy INTERFACE)
+ #        include/savvy/varint.hpp #src/savvy/varint.cpp include/savvy/varint.hpp
+ #        include/savvy/vcf_reader.hpp) #src/savvy/vcf_reader.cpp include/savvy/vcf_reader.hpp)
+ 
+-target_link_libraries(savvy INTERFACE shrinkwrap) #${ZLIB_LIBRARY} ${ZSTD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++#target_link_libraries(savvy INTERFACE shrinkwrap) #${ZLIB_LIBRARY} ${ZSTD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(savvy INTERFACE shrinkwrap ${ZSTD_LIBRARY}) #${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+ target_include_directories(savvy INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+ target_compile_definitions(savvy INTERFACE -DSAVVY_VERSION="${PROJECT_VERSION}")
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+enable_zstd.patch



View it on GitLab: https://salsa.debian.org/med-team/savvy/-/commit/26f8f0955671dcd62bb5cc61098095bf29b84deb

-- 
View it on GitLab: https://salsa.debian.org/med-team/savvy/-/commit/26f8f0955671dcd62bb5cc61098095bf29b84deb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220922/ce98c84b/attachment-0001.htm>