[med-svn] [Git][med-team/btllib][master] Fixup build

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / btllib


Commits:
66fbd8d2 by Nilesh Patra at 2023-12-28T15:27:48+05:30
Fixup build

- - - - -


2 changed files:

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


Changes:

=====================================
debian/control
=====================================
@@ -11,8 +11,9 @@ Build-Depends: debhelper-compat (= 13),
 #               libsdsl-dev, # only mentioned in doc but package builds without this as well
                libomp-dev,
                libargparse-dev,
+               libsdsl-dev,
                samtools,
-               python3
+               python3-all-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/btllib
 Vcs-Git: https://salsa.debian.org/med-team/btllib.git


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -4,7 +4,7 @@ Description: There is nothing to copy if libcpptoml-dev package is used
 
 --- a/scripts/install-cpptoml
 +++ b/scripts/install-cpptoml
-@@ -12,4 +12,4 @@ DESTDIR="${DESTDIR:-}"
+@@ -12,4 +12,4 @@
  
  mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
  
@@ -12,7 +12,7 @@ Description: There is nothing to copy if libcpptoml-dev package is used
 +#cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
 --- a/scripts/install-sdsl-lite
 +++ b/scripts/install-sdsl-lite
-@@ -12,4 +12,4 @@ DESTDIR="${DESTDIR:-}"
+@@ -12,4 +12,4 @@
  
  mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
  
@@ -20,12 +20,34 @@ Description: There is nothing to copy if libcpptoml-dev package is used
 +#cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
 --- a/meson.build
 +++ b/meson.build
-@@ -53,7 +53,7 @@ deps = [ threads_dep, openmp_dep ]
+@@ -32,7 +32,7 @@
+ endif
+ 
+ global_args = []
+-global_link_args = [ '-ldl' ]
++global_link_args = [ '-ldl', '-lsdsl' ]
+ 
+ if compiler_id == 'clang'
+   global_link_args += [ '-lstdc++', '-lm' ]
+@@ -53,8 +53,8 @@
  meson.add_install_script('scripts/install-cpptoml')
  meson.add_install_script('scripts/install-sdsl-lite')
  
 -argparse_subproject = cmake.subproject('argparse') # , options : cmake_options)
+-argparse_dep = argparse_subproject.dependency('argparse')
 +# argparse_subproject = cmake.subproject('argparse', options : cmake_options)
- argparse_dep = argparse_subproject.dependency('argparse')
++# argparse_dep = argparse_subproject.dependency('argparse')
  
  # Run time dependencies
+ # ===========================================================
+--- a/recipes/meson.build
++++ b/recipes/meson.build
+@@ -10,7 +10,7 @@
+ executable('randseq',
+             meson.project_source_root() + '/recipes/randseq.cpp',
+             include_directories : btllib_include,
+-            dependencies : deps + [ btllib_dep, argparse_dep ],
++            dependencies : deps + [ btllib_dep ],
+             install : true,
+             install_dir : 'bin',
+             override_options : ['cpp_std=c++17'])



View it on GitLab: https://salsa.debian.org/med-team/btllib/-/commit/66fbd8d28cda547484ad412c98e7161f1c194e2b

-- 
View it on GitLab: https://salsa.debian.org/med-team/btllib/-/commit/66fbd8d28cda547484ad412c98e7161f1c194e2b
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/20231228/acb17895/attachment-0001.htm>