[med-svn] [Git][med-team/sailfish][master] 2 commits: Build-Depends: rapmap-dev and adapt CMakeLists to use headers from this package

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / sailfish


Commits:
1cd83a9f by Andreas Tille at 2019-03-27T13:35:47Z
Build-Depends: rapmap-dev and adapt CMakeLists to use headers from this package

- - - - -
f7b273d2 by Andreas Tille at 2019-03-27T13:37:57Z
Document Rapmap version conflict with the Debian packaged rapmap-dev

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/dfsg-please.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -12,5 +12,14 @@ sailfish (0.10.1+dfsg-1) UNRELEASED; urgency=medium
         Date:   Fri Jul 15 18:35:43 2016 +0300
         
             Updated fmt lib to version 0d5ef5c2a66026409b0cfbafa1d2f46cdc5aa4d0
+    
+    2. Rapmap version conflict with the Debian packaged rapmap-dev:
+        In file included from /usr/include/rapmap/RapMapUtils.hpp:32,
+                        from /usr/include/rapmap/RapMapSAIndex.hpp:44,
+                        from /build/sailfish-0.10.1+dfsg/src/SailfishIndexer.cpp:60:
+        /usr/include/rapmap/Kmer.hpp:138:77: error: macro "bitmask" requires 2 arguments, but only 1 given
+         template <typename R> static constexpr R bitmask(unsigned int const onecount) {
+                                                                                     ^
+
 
  -- Steffen Moeller <moeller at debian.org>  Thu, 21 Mar 2019 22:47:18 +0100


=====================================
debian/control
=====================================
@@ -21,7 +21,8 @@ Build-Depends: debhelper (>= 12),
                libsparsehash-dev,
                libeigen3-dev,
                libspdlog-dev,
-               libcereal-dev
+               libcereal-dev,
+               rapmap-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/sailfish
 Vcs-Git: https://salsa.debian.org/med-team/sailfish.git


=====================================
debian/patches/dfsg-please.patch
=====================================
@@ -115,7 +115,7 @@ Description: Make sure we build against Debian packaged libraries
  
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -24,23 +24,23 @@ EmpiricalDistribution.cpp
+@@ -24,26 +24,23 @@ EmpiricalDistribution.cpp
  #HDF5Writer.cpp
  GZipWriter.cpp
  xxhash.c
@@ -141,10 +141,14 @@ Description: Make sure we build against Debian packaged libraries
  ${GAT_SOURCE_DIR}/tests
  ${GAT_SOURCE_DIR}/include
 -${GAT_SOURCE_DIR}/include/eigen3
-+/usr/include/eigen3
- ${GAT_SOURCE_DIR}/external
+-${GAT_SOURCE_DIR}/external
 -${GAT_SOURCE_DIR}/external/cereal/include
+-${GAT_SOURCE_DIR}/external/install/include
+-${GAT_SOURCE_DIR}/external/install/include/rapmap
+-${GAT_SOURCE_DIR}/external/install/include/jellyfish-2.2.3
++/usr/include/eigen3
 +/usr/include/cereal
- ${GAT_SOURCE_DIR}/external/install/include
- ${GAT_SOURCE_DIR}/external/install/include/rapmap
- ${GAT_SOURCE_DIR}/external/install/include/jellyfish-2.2.3
++/usr/include/rapmap
+ ${ZLIB_INCLUDE_DIR}
+ ${TBB_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}



View it on GitLab: https://salsa.debian.org/med-team/sailfish/compare/6adc7f7d186b71e431c892f645c3f89c1166b858...f7b273d23ae12c0d5ce1cf132ae37bb1d21c7ae1

-- 
View it on GitLab: https://salsa.debian.org/med-team/sailfish/compare/6adc7f7d186b71e431c892f645c3f89c1166b858...f7b273d23ae12c0d5ce1cf132ae37bb1d21c7ae1
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/20190327/954a77a6/attachment-0001.html>