[med-svn] [Git][med-team/seqwish][master] Use Debian packaged libargs

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / seqwish


Commits:
a920f30e by Andreas Tille at 2020-06-04T15:00:25+02:00
Use Debian packaged libargs

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_libs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -8,7 +8,6 @@ seqwish (0.6-1) UNRELEASED; urgency=medium
    * https://github.com/SaschaWitt/ips4o
    * https://github.com/ekg/atomicbitvector
    
-   * https://github.com/Taywee/args
    ... and more
 
  -- Andreas Tille <tille at debian.org>  Sun, 24 May 2020 16:17:07 +0200


=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 12),
                cmake,
                libsdsl-dev,
+               libargs-dev,
                libbbhash-dev,
                libgzstream-dev
 Standards-Version: 4.5.0


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -8,7 +8,7 @@
  # sdsl-lite (full build using its cmake config)
  ExternalProject_Add(sdsl-lite
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/sdsl-lite"
-@@ -36,6 +37,12 @@ set(sdsl-lite_INCLUDE "${INSTALL_DIR}/sr
+@@ -36,7 +37,14 @@ set(sdsl-lite_INCLUDE "${INSTALL_DIR}/sr
  set(sdsl-lite-divsufsort_INCLUDE "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/include")
  set(sdsl-lite_LIB "${INSTALL_DIR}/src/sdsl-lite-build/lib")
  set(sdsl-lite-divsufsort_LIB "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/lib")
@@ -19,16 +19,11 @@
 +# add_custom_target(libsdsl)
 +endif()
  
++if(!DEBIAN_BUILD)
  # taywee's C++ args library, header only
  ExternalProject_Add(tayweeargs
-@@ -46,12 +53,14 @@ ExternalProject_Get_property(tayweeargs
- set(tayweeargs_INCLUDE "${SOURCE_DIR}")
- 
- # gzip file reader, header only
-+if(!DEBIAN_BUILD)
- ExternalProject_Add(gzipreader
-   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/gzip_reader"
-   UPDATE_COMMAND ""
+   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/args"
+@@ -52,6 +60,7 @@ ExternalProject_Add(gzipreader
    INSTALL_COMMAND "")
  ExternalProject_Get_property(gzipreader SOURCE_DIR)
  set(gzipreader_INCLUDE "${SOURCE_DIR}")



View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/a920f30eb488e21a1ea1f3b87f43e2925df91180

-- 
View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/a920f30eb488e21a1ea1f3b87f43e2925df91180
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/20200604/9e8a06e9/attachment-0001.html>