diff --git a/debian/patches/0004-Link-to-jemalloc-for-better-memory-usage.patch b/debian/patches/0004-Link-to-jemalloc-for-better-memory-usage.patch deleted file mode 100644 index f5bf15037..000000000 --- a/debian/patches/0004-Link-to-jemalloc-for-better-memory-usage.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jason Rhinelander -Date: Tue, 29 Jun 2021 16:00:14 -0300 -Subject: Link to jemalloc for better memory usage - ---- - CMakeLists.txt | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 475590b..7edb136 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -305,6 +305,20 @@ endif() - add_subdirectory(external) - include_directories(SYSTEM external/sqlite_orm/include) - -+option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON) -+if(USE_JEMALLOC AND NOT STATIC_LINK) -+ pkg_check_modules(JEMALLOC jemalloc IMPORTED_TARGET) -+ if(JEMALLOC_FOUND) -+ message(STATUS "Found jemalloc ${JEMALLOC_VERSION}") -+ target_link_libraries(base_libs INTERFACE PkgConfig::JEMALLOC) -+ else() -+ message(STATUS "jemalloc not found, not linking to jemalloc") -+ endif() -+else() -+ message(STATUS "jemalloc support disabled") -+endif() -+ -+ - if(ANDROID) - target_link_libraries(base_libs INTERFACE log) - target_compile_definitions(base_libs INTERFACE ANDROID) diff --git a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch index 716835a16..2c6c3deb2 100644 --- a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch +++ b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch @@ -8,7 +8,7 @@ Rather than cramming it into CXXFLAGS in debian/rules. 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea26515..475590b 100644 +index 8f98214..901f8e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,9 @@ include(cmake/unix.cmake) diff --git a/debian/patches/series b/debian/patches/series index e75240c9d..deec55d43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0004-Make-root-bootstraps-to-system-path.patch 0005-Move-default-user-group-into-deb-patch.patch 0007-Pass-debian-version-as-GIT_VERSION.patch -0004-Link-to-jemalloc-for-better-memory-usage.patch