diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-gfx/solvespace/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'media-gfx/solvespace/files')
| -rw-r--r-- | media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch new file mode 100644 index 000000000000..118a920c741d --- /dev/null +++ b/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch @@ -0,0 +1,41 @@ +From a793c7d67fc886b1eb66ab67551f3a2448e4adc0 Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Thu, 9 Jun 2022 20:19:19 +0100 +Subject: [PATCH] build: Use system mimalloc + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,13 +185,7 @@ endif() + message(STATUS "Using in-tree libdxfrw") + add_subdirectory(extlib/libdxfrw) + +-message(STATUS "Using in-tree mimalloc") +-set(MI_OVERRIDE OFF CACHE BOOL "") +-set(MI_BUILD_SHARED OFF CACHE BOOL "") +-set(MI_BUILD_OBJECT OFF CACHE BOOL "") +-set(MI_BUILD_TESTS OFF CACHE BOOL "") +-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL) +-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include) ++find_package(mimalloc REQUIRED) + + if(NOT FORCE_VENDORED_Eigen3) + find_package(Eigen3 CONFIG) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -27,7 +27,6 @@ target_include_directories(slvs_deps INTERFACE SYSTEM + ${PNG_PNG_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} +- ${MIMALLOC_INCLUDE_DIR} + ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(slvs_deps INTERFACE + dxfrw +@@ -35,7 +34,7 @@ target_link_libraries(slvs_deps INTERFACE + ${PNG_LIBRARY} + ${FREETYPE_LIBRARY} + ${CAIRO_LIBRARIES} +- mimalloc-static) ++ mimalloc) + + if(Backtrace_FOUND) + target_include_directories(slvs_deps INTERFACE SYSTEM |