[med-svn] [Git][med-team/libmmmulti][master] 2 commits: Rebase patches to latest upstream version

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Oct 28 09:00:21 GMT 2026



Andreas Tille pushed to branch master at Debian Med / libmmmulti


Commits:
bd0299fe by Andreas Tille at 2026-10-28T09:55:52+01:00
Rebase patches to latest upstream version

- - - - -
2eb790f3 by Andreas Tille at 2026-10-28T09:56:54+01:00
Add libmio-dev to build dependencies for new upstream

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/NoExternalSourceTrees.patch
- debian/patches/cmake-4.patch
- debian/patches/fix-atomic-queue-include-path.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,8 @@ libmmmulti (0.1+git20210125.d8fb6c9-1) UNRELEASED; urgency=medium
   * For latest vg we need the last upstream commit which is not tagged
     so adapt d/watch to fetch latest commit
   * New upstream version
+  * Rebase patches to latest upstream
+  * Add libmio-dev to build dependencies
 
  -- Andreas Tille <tille at debian.org>  Wed, 28 Oct 2026 09:28:16 +0100
 


=====================================
debian/control
=====================================
@@ -10,8 +10,8 @@ Build-Depends:
  cmake,
  libargs-dev,
  libatomic-queue-dev,
- libatomicbitvector-dev,
  libips4o-dev,
+ libmio-dev,
  libparyfor-dev,
  libsdsl-dev,
 Vcs-Browser: https://salsa.debian.org/med-team/libmmmulti


=====================================
debian/patches/NoExternalSourceTrees.patch
=====================================
@@ -1,7 +1,9 @@
 Description: Do not use external libraries - use system libraries 
 Author: Steffen Moeller <moeller at debian.org>, Andreas Tille <tille at debian.org>, Nilesh Patra <npatra974 at gmail.com>
 Forwarded: not-needed
-Last-Update: 2020-10-27 
+Last-Update: 2026-10-28
+Assisted-By: scaleway/deepseek-v4-flash-0731
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -11,8 +11,8 @@
@@ -12,10 +14,10 @@ Last-Update: 2020-10-27
 -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -mcx16 -g")
 +set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -g -fPIC -fopenmp")
 +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -g -fPIC -fopenmp")
- 
- # Set the output folder where your program will be created
- set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
-@@ -22,110 +22,22 @@
+ # for debugging, unset and run with ASAN_OPTIONS=detect_leaks=1:symbolize=1 LSAN_OPTIONS=verbosity=1:log_threads=1
+ #set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O -mcx16 -g -fsanitize=address")
+ #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O -mcx16 -g -fsanitize=address")
+@@ -25,117 +25,32 @@
  # The following folder will be included
  include_directories("${PROJECT_SOURCE_DIR}")
  
@@ -34,9 +36,8 @@ Last-Update: 2020-10-27
 -
 -# sdsl-lite (full build using its cmake config)
 -ExternalProject_Add(sdsl-lite
--  GIT_REPOSITORY "https://github.com/simongog/sdsl-lite.git"
--  GIT_TAG "ddb0fbbc33bb183baa616f17eb48e261ac2a3672"
--  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR} # TODO ADD static build flag
+-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/sdsl-lite"
+-  CMAKE_ARGS "${CMAKE_ARGS};-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
 -  UPDATE_COMMAND ""
 -  INSTALL_COMMAND "")
 -ExternalProject_Get_property(sdsl-lite INSTALL_DIR)
@@ -47,45 +48,39 @@ Last-Update: 2020-10-27
 -
 -# DYNAMIC (full build using its cmake config)
 -ExternalProject_Add(dynamic
--  GIT_REPOSITORY "https://github.com/vgteam/DYNAMIC.git"
--  GIT_TAG "615d8be5276bcd4c5a3d8e31679b4f8e81b2eefc"
--  # we don't actually install dynamic... it's header only
--  #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}
+-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/DYNAMIC"
 -  UPDATE_COMMAND ""
 -  INSTALL_COMMAND ""
 -  BUILD_COMMAND ""
 -  CONFIGURE_COMMAND "")
--ExternalProject_Get_property(dynamic INSTALL_DIR)
--set(dynamic_INCLUDE "${INSTALL_DIR}/src/dynamic/include")
+-ExternalProject_Get_property(dynamic SOURCE_DIR)
+-set(dynamic_INCLUDE "${SOURCE_DIR}/include")
 -
--# In-place Parallel Super Scalar Samplesort (IPS⁴o), header only
--ExternalProject_Add(ips4o
--  GIT_REPOSITORY "https://github.com/SaschaWitt/ips4o.git"
--  GIT_TAG "a34d7d40c0f1279510e35e0dc2c69637b3c5d0b6"
--  #GIT_REPOSITORY "https://github.com/ekg/ips4o.git"
--  #GIT_TAG "f7eccc5a26928b5c0772922f7b76072414ef1801"
+-ExternalProject_Add(hopscotch_map
+-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/hopscotch-map"
 -  UPDATE_COMMAND ""
 -  INSTALL_COMMAND ""
 -  BUILD_COMMAND ""
 -  CONFIGURE_COMMAND "")
--ExternalProject_Get_property(ips4o SOURCE_DIR)
--set(ips4o_INCLUDE "${SOURCE_DIR}")
+-ExternalProject_Get_property(hopscotch_map SOURCE_DIR)
+-set(hopscotch_map_INCLUDE "${SOURCE_DIR}/include")
+-
+-# In-place Parallel Super Scalar Samplesort (IPS⁴o), header only
+-add_subdirectory(${CMAKE_SOURCE_DIR}/deps/ips4o)
 -
 -# atomic queue
 -ExternalProject_Add(atomicqueue
--  GIT_REPOSITORY "https://github.com/max0x7ba/atomic_queue.git"
--  GIT_TAG "430f732da0889b090705ad00ce15d4463fe7b536"
+-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/atomic_queue/include/atomic_queue"
 -  UPDATE_COMMAND ""
 -  INSTALL_COMMAND ""
 -  BUILD_COMMAND ""
 -  CONFIGURE_COMMAND "")
 -ExternalProject_Get_property(atomicqueue SOURCE_DIR)
--set(atomicqueue_INCLUDE "${SOURCE_DIR}")
+-set(atomicqueue_INCLUDE "${SOURCE_DIR}/")
 -
 -# paryfor parallel_for
 -ExternalProject_Add(paryfor
--  GIT_REPOSITORY "https://github.com/ekg/paryfor"
--  GIT_TAG "509b28a092f732a068e2908bb9e359a8562cd32f"
+-  SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/paryfor"
 -  UPDATE_COMMAND ""
 -  INSTALL_COMMAND ""
 -  BUILD_COMMAND ""
@@ -94,15 +89,12 @@ Last-Update: 2020-10-27
 -set(paryfor_INCLUDE "${SOURCE_DIR}")
 -
 -# taywee's C++ args library, header only
--ExternalProject_Add(tayweeargs
--  GIT_REPOSITORY "https://github.com/Taywee/args.git"
--  GIT_TAG "3de44ec671db452cc0c4ef86399b108939768abb"
--  UPDATE_COMMAND ""
--  INSTALL_COMMAND "")
--ExternalProject_Get_property(tayweeargs SOURCE_DIR)
--set(tayweeargs_INCLUDE "${SOURCE_DIR}")
+-set(tayweeargs_INCLUDE deps/args)
+-
+-add_subdirectory(deps/mio)
 -
 -#set(CMAKE_BUILD_TYPE Release)
++# Use the system libraries instead of the external projects bundled in deps/
 +set(atomicqueue_INCLUDE "/usr/include/atomic_queue")
  
  # set up our target executable and specify its dependencies and includes
@@ -111,30 +103,31 @@ Last-Update: 2020-10-27
    )
 -add_dependencies(mmmulti sdsl-lite)
 -add_dependencies(mmmulti dynamic)
--add_dependencies(mmmulti ips4o)
 -add_dependencies(mmmulti atomicqueue)
 -add_dependencies(mmmulti paryfor)
--add_dependencies(mmmulti tayweeargs)
+-
  target_include_directories(mmmulti PUBLIC
    "${CMAKE_SOURCE_DIR}/src"
 -  "${sdsl-lite_INCLUDE}"
 -  "${sdsl-lite-divsufsort_INCLUDE}"
 -  "${dynamic_INCLUDE}"
--  "${ips4o_INCLUDE}"
-+#  "${sdsl-lite_INCLUDE}"
-+#  "${sdsl-lite-divsufsort_INCLUDE}"
-+#  "${dynamic_INCLUDE}"
-+#  "${ips4o_INCLUDE}"
-   "${atomicqueue_INCLUDE}"
+-  "${atomicqueue_INCLUDE}"
 -  "${paryfor_INCLUDE}"
 -  "${tayweeargs_INCLUDE}")
-+#  "${paryfor_INCLUDE}"
-+#  "${tayweeargs_INCLUDE}"
-+  )
++  "${atomicqueue_INCLUDE}")
    
  # macOS doesn't want you to link in libatomic this way
  if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -137,9 +49,9 @@
+   target_link_libraries(mmmulti
+-    "${sdsl-lite_LIB}/libsdsl.a"
+-    "${sdsl-lite-divsufsort_LIB}/libdivsufsort.a"
+-    "${sdsl-lite-divsufsort_LIB}/libdivsufsort64.a"
++    "-lsdsl"
++    "-ldivsufsort"
++    "-ldivsufsort64"
+     Threads::Threads
+-    ips4o
+-    mio
      )
  elseif (TRUE)
    target_link_libraries(mmmulti
@@ -146,12 +139,16 @@ Last-Update: 2020-10-27
 +    "-ldivsufsort64"
      "-latomic"
      Threads::Threads
+-    ips4o
+-    mio
      )
-@@ -150,7 +62,7 @@
+ endif()
+ 
+@@ -144,7 +59,7 @@
  elseif (TRUE)
    # this was hard to track down
    # https://stackoverflow.com/questions/35116327/when-g-static-link-pthread-cause-segmentation-fault-why
--  set(CMAKE_EXE_LINKER_FLAGS "-static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
+-  #set(CMAKE_EXE_LINKER_FLAGS "-static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
 +  set (CMAKE_SHARED_LINKER_FLAGS "-lpthread -Wl,--as-needed")
  endif()
  


=====================================
debian/patches/cmake-4.patch
=====================================
@@ -4,8 +4,7 @@ Author: Étienne Mollier <emollier at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1113174
 Forwarded: no
 Last-Update: 2025-10-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
 --- libmmmulti.orig/CMakeLists.txt
 +++ libmmmulti/CMakeLists.txt
 @@ -1,6 +1,6 @@


=====================================
debian/patches/fix-atomic-queue-include-path.patch
=====================================
@@ -1,12 +1,13 @@
 Description: Fix according to the heder file path of libatomic-queue
 Author: Nilesh Patra <npatra974 at gmail.com>
 Forwarded: not-needed
-Last-Update: 2020-10-27 
+Last-Update: 2026-10-28
+Assisted-By: scaleway/deepseek-v4-flash-0731
 --- a/src/mmiitree.hpp
 +++ b/src/mmiitree.hpp
-@@ -16,7 +16,7 @@
- #include <functional>
+@@ -17,7 +17,7 @@
  #include <thread>
+ #include <mio/mmap.hpp>
  #include "ips4o.hpp"
 -#include "atomic_queue.h"
 +#include "atomic_queue/atomic_queue.h"
@@ -15,7 +16,7 @@ Last-Update: 2020-10-27
   * implicitly form a complete binary tree of height K+1. We consider leaves to
 --- a/src/mmmultimap.hpp
 +++ b/src/mmmultimap.hpp
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
  
  #include "sdsl/bit_vectors.hpp"
  #include "ips4o.hpp"
@@ -26,7 +27,7 @@ Last-Update: 2020-10-27
  
 --- a/src/mmmultiset.hpp
 +++ b/src/mmmultiset.hpp
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
  
  #include "sdsl/bit_vectors.hpp"
  #include "ips4o.hpp"



View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/compare/e797bc55ae5d3d42bafab7eb74c079baf4fe8571...2eb790f33109d109ce2764ba0b3934d911a62e60

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/compare/e797bc55ae5d3d42bafab7eb74c079baf4fe8571...2eb790f33109d109ce2764ba0b3934d911a62e60
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/f2ee1126/attachment-0001.htm>


More information about the debian-med-commit mailing list