[med-svn] [Git][med-team/btllib][master] 5 commits: Add patch to get build going

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / btllib


Commits:
5c225d18 by Nilesh Patra at 2022-09-30T17:20:22+05:30
Add patch to get build going

- - - - -
2dcc14b3 by Nilesh Patra at 2022-09-30T17:20:22+05:30
B-D on libomp-dev

- - - - -
a88a1d8a by Nilesh Patra at 2022-09-30T17:20:22+05:30
samtools in B-D as well

- - - - -
fa5b4ca6 by Nilesh Patra at 2022-09-30T17:20:22+05:30
d/rules: copy tests/ dir in obj-* before dh_auto_test

- - - - -
2ae1f78c by Nilesh Patra at 2022-09-30T17:20:22+05:30
Add wget and samtools to depends as per https://bcgsc.github.io/btllib/

- - - - -


4 changed files:

- debian/control
- + debian/patches/find_object_files_at_right_loc.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -7,7 +7,9 @@ Build-Depends: debhelper-compat (= 13),
                meson,
                ninja-build,
                libcpptoml-dev,
-               libsdsl-dev
+               libsdsl-dev,
+               libomp-dev,
+               samtools
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/med-team/btllib
 Vcs-Git: https://salsa.debian.org/med-team/btllib.git
@@ -16,7 +18,7 @@ Rules-Requires-Root: no
 
 Package: btllib
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samtools, wget
 Description: Bioinformatics Technology Lab common code library
  Bioinformatics Technology Lab common code library in C++ with
  Python wrappers.


=====================================
debian/patches/find_object_files_at_right_loc.patch
=====================================
@@ -0,0 +1,32 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('btllib', 'cpp',
+         version : '1.4.9',
+         license : 'GPL3',
+-        default_options : [ 'cpp_std=c++11', 'warning_level=3', 'werror=true' ],
++        default_options : [ 'cpp_std=c++11', 'warning_level=3', 'werror=false' ],
+         meson_version : '>= 0.60.0')
+ 
+ # Configuration
+@@ -47,19 +47,7 @@
+ threads_dep = dependency('threads')
+ openmp_dep = dependency('openmp', required : false)
+ 
+-cmake_options = cmake.subproject_options()
+-cmake_options.set_override_option('werror', 'false')
+-cmake_options.set_install(false)
+-
+-cpptoml_subproject = cmake.subproject('cpptoml', options : cmake_options)
+-cpptomp_dep = cpptoml_subproject.dependency('cpptoml')
+-
+-run_command(meson.project_source_root() + '/scripts/prepare-sdsl')
+-
+-sdsl_subproject = cmake.subproject('sdsl-lite', options : cmake_options)
+-sdsl_dep = sdsl_subproject.dependency('sdsl')
+-
+-deps = [ threads_dep, openmp_dep, cpptomp_dep, sdsl_dep ]
++deps = [ threads_dep, openmp_dep ]
+ 
+ # These are unfortunate hacks. Currently, neither cpptoml nor sdsl-lite install their headers (even when set_install(true) is called), and so we need to do it manually
+ meson.add_install_script('scripts/install-cpptoml')


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


=====================================
debian/rules
=====================================
@@ -4,3 +4,7 @@
 
 %:
 	dh $@
+
+override_dh_auto_test:
+	cp -a tests/ obj-*/
+	dh_auto_test



View it on GitLab: https://salsa.debian.org/med-team/btllib/-/compare/3c92e4db2a4496a8472f42593109bdc29e6a2a17...2ae1f78cffc2ec134f7e95d580b5116b79aec34c

-- 
View it on GitLab: https://salsa.debian.org/med-team/btllib/-/compare/3c92e4db2a4496a8472f42593109bdc29e6a2a17...2ae1f78cffc2ec134f7e95d580b5116b79aec34c
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/20220930/c8550874/attachment-0001.htm>