[med-svn] [Git][med-team/sortmerna][master] 3 commits: Remove old hacks

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / sortmerna


Commits:
86e8e1ef by Andreas Tille at 2022-01-31T17:40:50+01:00
Remove old hacks

- - - - -
583ebbff by Andreas Tille at 2022-01-31T17:41:30+01:00
Build-Depends: libconcurrentqueue-dev

- - - - -
b86324c4 by Andreas Tille at 2022-02-01T09:04:58+01:00
Try hard to prevent static linking but its not fully working.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/concurrentqueue.h.patch
- + debian/patches/no_static_linking.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -12,8 +12,7 @@ sortmerna (4.3.4-1) UNRELEASED; urgency=medium
   * Versioned Build-Depends: librocksdb-dev (>= 6.25.3)
   * Build-Depends: libgflags-dev, libsnappy-dev, libzstd-dev
     (needed by librocksdb-dev (>= 6.25.3) - see #1004665)
-  * Build-Depends: rapidjson-dev
-  TODO: cmake issues 
+  * Build-Depends: rapidjson-dev, libconcurrentqueue-dev
 
  -- Andreas Tille <tille at debian.org>  Mon, 31 Jan 2022 13:37:04 +0100
 


=====================================
debian/control
=====================================
@@ -9,7 +9,8 @@ Build-Depends: debhelper-compat (= 13),
                libgflags-dev,
                libsnappy-dev,
                libzstd-dev,
-               rapidjson-dev
+               rapidjson-dev,
+               libconcurrentqueue-dev
 #               python3 <!nocheck>,
 #               python3-skbio <!nocheck>,
 Standards-Version: 4.6.0


=====================================
debian/patches/concurrentqueue.h.patch
=====================================
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 31 Jan 2022 13:37:04 +0100
+Description: Fix include statement for Debian packaged concurrentqueue
+
+--- a/include/readsqueue.hpp
++++ b/include/readsqueue.hpp
+@@ -46,7 +46,7 @@
+ #include "read.hpp"
+ 
+ #if defined(CONCURRENTQUEUE)
+-#  include "concurrentqueue.h"
++#  include <concurrentqueue/concurrentqueue.h>
+ #elif defined(LOCKQUEUE)
+ #  include <queue>
+ #endif


=====================================
debian/patches/no_static_linking.patch
=====================================
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 31 Jan 2022 13:37:04 +0100
+Description: Prevent static linking
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,8 +69,8 @@ set(CONCURRENTQUEUE_URL https://github.c
+ set(CONCURRENTQUEUE_HOME ${EXTERNAL_DEPS}/concurrentqueue CACHE PATH "Concurrent queue library installation directory")
+ #set(gflags_DIR  ${EXTERNAL_DEPS}/gflags/dist/lib/cmake/gflags CACHE PATH "GFlags library configuration")
+ 
+-option(ROCKSDB_STATIC "Use static RocksDB library" ON)
+-option(ZLIB_STATIC "Use static ZLib library" ON)
++#option(ROCKSDB_STATIC "Use static RocksDB library" ON)
++#option(ZLIB_STATIC "Use static ZLib library" ON)
+ 
+ option(PORTABLE "Build portable/statically linked executable" ON)
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 cmake_RocksDB.patch
 rapidjson.patch
+concurrentqueue.h.patch
+no_static_linking.patch


=====================================
debian/rules
=====================================
@@ -15,12 +15,10 @@ export CMAKE_PREFIX_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/
 
 override_dh_clean:
 	dh_clean
-	rm -f index/.tobuild
 	rm -f include/memcheck.h
 	rm -rf tmp
 
 override_dh_auto_build:
-	touch index/.tobuild
 	dh_auto_build
 	mkdir -p tmp
 	cat debian/README_scripts.txt rRNA_databases/README.txt > tmp/README.txt



View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/7cbe41c0d788a9f188f841553bb54cf0e2be55cd...b86324c41e36f23e84553b77231994a5d36e9cb6

-- 
View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/7cbe41c0d788a9f188f841553bb54cf0e2be55cd...b86324c41e36f23e84553b77231994a5d36e9cb6
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/20220201/fb2891a2/attachment-0001.htm>