[med-svn] [Git][med-team/sortmerna][master] 2 commits: librocksdb-dev does not contain cmake input files

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / sortmerna


Commits:
9bc9ec2f by Andreas Tille at 2021-10-18T15:25:34+02:00
librocksdb-dev does not contain cmake input files

- - - - -
e4b8fc15 by Andreas Tille at 2022-01-31T13:39:56+01:00
FIx finding RocksDB

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/cmake_RocksDB.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -9,8 +9,13 @@ sortmerna (4.3.4-1) UNRELEASED; urgency=medium
   * Standards-Version: 4.6.0 (routine-update)
   * Build-Depends: cmake
   * Remove Tim Booth from Uploaders (thanks for all your work Tim)
+  * 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 
 
- -- Andreas Tille <tille at debian.org>  Thu, 14 Oct 2021 16:41:44 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 31 Jan 2022 13:37:04 +0100
 
 sortmerna (2.1-5) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -4,7 +4,12 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               cmake
+               cmake,
+               librocksdb-dev (>= 6.25.3),
+               libgflags-dev,
+               libsnappy-dev,
+               libzstd-dev,
+               rapidjson-dev
 #               python3 <!nocheck>,
 #               python3-skbio <!nocheck>,
 Standards-Version: 4.6.0


=====================================
debian/patches/cmake_RocksDB.patch
=====================================
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 31 Jan 2022 13:37:04 +0100
+Description: Fix finding RocksDB
+
+--- a/src/sortmerna/CMakeLists.txt
++++ b/src/sortmerna/CMakeLists.txt
+@@ -12,10 +12,7 @@ set(CMAKE_CXX_STANDARD 17)
+ 
+ find_package(Threads REQUIRED)
+ 
+-find_package(RocksDB CONFIG REQUIRED
+-  PATHS ${ROCKSDB_HOME}
+-  NO_DEFAULT_PATH
+-)
++find_package(RocksDB)
+ 
+ if(RocksDB_FOUND)
+ 	message("RocksDB package OK")


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


=====================================
debian/rules
=====================================
@@ -5,6 +5,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export CMAKE_PREFIX_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/
+
 %:
 	dh $@
 



View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/3b72341a6cd743a229c831d01e83284c0b301e3b...e4b8fc1505abc2ac189ee75a87e62b1e3e9693d3

-- 
View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/3b72341a6cd743a229c831d01e83284c0b301e3b...e4b8fc1505abc2ac189ee75a87e62b1e3e9693d3
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/20220131/df499e25/attachment-0001.htm>