[med-svn] [Git][med-team/libbdsg][master] Use Debian packaged libs

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Oct 28 10:15:59 GMT 2026



Andreas Tille pushed to branch master at Debian Med / libbdsg


Commits:
309be1f8 by Andreas Tille at 2026-10-28T11:15:37+01:00
Use Debian packaged libs

- - - - -


3 changed files:

- debian/control
- debian/libbdsg-dev.install
- debian/patches/use-system-deps.patch


Changes:

=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends:
  cmake,
  libbbhash-dev (>= 1.0.0-8~),
  libboost-dev,
- libhandlegraph-dev,
+ libhandlegraph-dev (>= 20261019~),
  libjansson-dev,
  libsdsl-dev (>= 2.4),
  libtsl-hopscotch-map-dev,


=====================================
debian/libbdsg-dev.install
=====================================
@@ -1,5 +1,2 @@
 usr/include/bdsg
-usr/include/mio
-usr/include/sparsepp
 usr/lib/*/libbdsg.so
-usr/share/cmake/mio


=====================================
debian/patches/use-system-deps.patch
=====================================
@@ -1,17 +1,16 @@
 Description: Use system libraries instead of the bundled git submodules
  The upstream build expects the sdsl-lite, DYNAMIC, hopscotch-map,
- libhandlegraph and BBHash git submodules. Debian packages all of these, so
- use the system headers and libraries. sparsepp and mio are not packaged
- separately and remain bundled.
+ libhandlegraph, BBHash, sparsepp and mio git submodules. Debian packages all
+ of these, so use the system headers and libraries instead.
 Author: Andreas Tille <tille at debian.org>
-Last-Update: 2026-10-25
-Assisted-By: opencode/deepseek-v4.1-flash-free
+Last-Update: 2026-10-27
+Assisted-By: aim2balance.ai/a2b-code
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0413a0b..899eadc 100644
+index 0413a0b..d9440be 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -158,50 +158,33 @@ include_directories("${PROJECT_SOURCE_DIR}")
+@@ -158,60 +158,41 @@ include_directories("${PROJECT_SOURCE_DIR}")
  # Add external projects
  include(ExternalProject)
  
@@ -80,16 +79,37 @@ index 0413a0b..899eadc 100644
 -# We would be able to use public_header for the one header, but that's not allowed with IMPORTED libraries.
 +target_include_directories(bbhash INTERFACE ${BBHASH_INCLUDE_DIR})
  
- # sparsepp (header only)
- # Does not ship its own install step or define a target, so we make our own target
-@@ -400,9 +383,7 @@ install(DIRECTORY ${bdsg_DIR}/include/bdsg
- # Install headers from all dependencies. Make sure to use a trailing slash to
- # dump all contents rather than the directory. Don't install Binder's includes
- # since we don't need headers for the Python module.
+-# sparsepp (header only)
+-# Does not ship its own install step or define a target, so we make our own target
++# sparsepp (system package, header only)
++find_path(SPARSEPP_INCLUDE_DIR sparsepp/spp.h REQUIRED)
+ add_library(sparsepp INTERFACE)
+-target_include_directories(sparsepp INTERFACE "${bdsg_DIR}/deps/sparsepp/")
++target_include_directories(sparsepp INTERFACE ${SPARSEPP_INCLUDE_DIR})
+ 
+-# mio (header only)
+-if (NOT TARGET mio::mio)
+-    add_subdirectory("${bdsg_DIR}/deps/mio")
+-endif()
++# mio (system package, header only)
++find_package(mio REQUIRED)
+ 
+ if (BUILD_PYTHON_BINDINGS)
+ 
+@@ -397,16 +378,6 @@ install(TARGETS libbdsg
+ # Install headers separately. See <https://stackoverflow.com/a/54285948>
+ install(DIRECTORY ${bdsg_DIR}/include/bdsg
+         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+-# Install headers from all dependencies. Make sure to use a trailing slash to
+-# dump all contents rather than the directory. Don't install Binder's includes
+-# since we don't need headers for the Python module.
 -install(DIRECTORY "${bdsg_DIR}/deps/DYNAMIC/include/"
 -                  "${bdsg_DIR}/deps/BBHash/"
 -                  "${bdsg_DIR}/deps/sparsepp/sparsepp"
-+install(DIRECTORY "${bdsg_DIR}/deps/sparsepp/sparsepp"
-         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-         FILES_MATCHING
-         PATTERN "*.hpp"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-        FILES_MATCHING
+-        PATTERN "*.hpp"
+-        PATTERN "*.h")
+ 
+ add_executable(test_libbdsg
+   ${bdsg_DIR}/src/test_libbdsg.cpp)



View it on GitLab: https://salsa.debian.org/med-team/libbdsg/-/commit/309be1f81e217ed3eff4af8c2d98311db772b069

-- 
View it on GitLab: https://salsa.debian.org/med-team/libbdsg/-/commit/309be1f81e217ed3eff4af8c2d98311db772b069
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261028/0c1f7291/attachment-0001.htm>


More information about the debian-med-commit mailing list