| 1 |
commit: f3a81d71b2cf89ac4d556ecd38345920ac4e699d |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Sep 12 17:22:15 2022 +0000 |
| 4 |
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 12 18:17:16 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a81d71 |
| 7 |
|
| 8 |
media-gfx/solvespace: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/27231 |
| 13 |
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/solvespace-3.0-use-system-mimalloc.patch | 74 ---------------------- |
| 16 |
1 file changed, 74 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 485a870449b2..000000000000 |
| 21 |
--- a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,74 +0,0 @@ |
| 24 |
-From eb8cd7a379503a0206d6ff43a2ce0749a32f2a37 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Matthew Smith <matthew@g.o> |
| 26 |
-Date: Fri, 11 Mar 2022 18:11:27 +0000 |
| 27 |
-Subject: [PATCH] build: Use system mimalloc |
| 28 |
- |
| 29 |
---- |
| 30 |
- CMakeLists.txt | 8 -------- |
| 31 |
- src/CMakeLists.txt | 12 +++--------- |
| 32 |
- 2 files changed, 3 insertions(+), 17 deletions(-) |
| 33 |
- |
| 34 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
-index bdd3670..93485d7 100644 |
| 36 |
---- a/CMakeLists.txt |
| 37 |
-+++ b/CMakeLists.txt |
| 38 |
-@@ -173,14 +173,6 @@ endif() |
| 39 |
- message(STATUS "Using in-tree libdxfrw") |
| 40 |
- add_subdirectory(extlib/libdxfrw) |
| 41 |
- |
| 42 |
--message(STATUS "Using in-tree mimalloc") |
| 43 |
--set(MI_OVERRIDE OFF CACHE BOOL "") |
| 44 |
--set(MI_BUILD_SHARED OFF CACHE BOOL "") |
| 45 |
--set(MI_BUILD_OBJECT OFF CACHE BOOL "") |
| 46 |
--set(MI_BUILD_TESTS OFF CACHE BOOL "") |
| 47 |
--add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL) |
| 48 |
--set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include) |
| 49 |
-- |
| 50 |
- if(WIN32 OR APPLE) |
| 51 |
- # On Win32 and macOS we use vendored packages, since there is little to no benefit |
| 52 |
- # to trying to find system versions. In particular, trying to link to libraries from |
| 53 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 54 |
-index 5ac7b41..9f4e2f7 100644 |
| 55 |
---- a/src/CMakeLists.txt |
| 56 |
-+++ b/src/CMakeLists.txt |
| 57 |
-@@ -55,10 +55,7 @@ target_include_directories(slvs |
| 58 |
- |
| 59 |
- target_link_libraries(slvs |
| 60 |
- ${util_LIBRARIES} |
| 61 |
-- mimalloc-static) |
| 62 |
-- |
| 63 |
--add_dependencies(slvs |
| 64 |
-- mimalloc-static) |
| 65 |
-+ mimalloc) |
| 66 |
- |
| 67 |
- set_target_properties(slvs PROPERTIES |
| 68 |
- PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/slvs.h |
| 69 |
-@@ -213,9 +210,6 @@ add_library(solvespace-core STATIC |
| 70 |
- ${solvespace_core_HEADERS} |
| 71 |
- ${solvespace_core_SOURCES}) |
| 72 |
- |
| 73 |
--add_dependencies(solvespace-core |
| 74 |
-- mimalloc-static) |
| 75 |
-- |
| 76 |
- target_link_libraries(solvespace-core |
| 77 |
- ${OpenMP_CXX_LIBRARIES} |
| 78 |
- dxfrw |
| 79 |
-@@ -223,7 +217,7 @@ target_link_libraries(solvespace-core |
| 80 |
- ${ZLIB_LIBRARY} |
| 81 |
- ${PNG_LIBRARY} |
| 82 |
- ${FREETYPE_LIBRARY} |
| 83 |
-- mimalloc-static) |
| 84 |
-+ mimalloc) |
| 85 |
- |
| 86 |
- if(Backtrace_FOUND) |
| 87 |
- target_link_libraries(solvespace-core |
| 88 |
-@@ -430,4 +424,4 @@ if(APPLE) |
| 89 |
- COMMENT "Bundling executable solvespace-cli" |
| 90 |
- VERBATIM) |
| 91 |
- endif() |
| 92 |
--endif() |
| 93 |
-\ No newline at end of file |
| 94 |
-+endif() |
| 95 |
--- |
| 96 |
-2.35.1 |
| 97 |
- |
Archives