From: Anton Gladky Date: Fri, 15 Jan 2021 14:39:59 +0000 (+0100) Subject: Remove arm-patch X-Git-Tag: archive/raspbian/3.1+ds1-4+rpi1^2~108 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3fa5dd1da4cb9444dbbec2ba2b80a6e8148e4255;p=solvespace.git Remove arm-patch --- diff --git a/debian/patches/30_use_cxx_for_mimalloc.patch b/debian/patches/30_use_cxx_for_mimalloc.patch deleted file mode 100644 index 35c9242..0000000 --- a/debian/patches/30_use_cxx_for_mimalloc.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Use CXX for mimalloc. Fixes FTBFS on arm -Author: Anton Gladky -Last-Update: 2021-01-14 - ---- solvespace-3.0.rc1+repack1.orig/extlib/mimalloc/CMakeLists.txt -+++ solvespace-3.0.rc1+repack1/extlib/mimalloc/CMakeLists.txt -@@ -10,7 +10,7 @@ option(MI_PADDING "Enable padd - option(MI_OVERRIDE "Override the standard malloc interface (e.g. define entry points for malloc() etc)" ON) - option(MI_XMALLOC "Enable abort() call on memory allocation failure by default" OFF) - option(MI_SHOW_ERRORS "Show error and warning messages by default (only enabled by default in DEBUG mode)" OFF) --option(MI_USE_CXX "Use the C++ compiler to compile the library (instead of the C compiler)" OFF) -+option(MI_USE_CXX "Use the C++ compiler to compile the library (instead of the C compiler)" ON) - option(MI_SEE_ASM "Generate assembly files" OFF) - option(MI_INTERPOSE "Use interpose to override standard malloc on macOS" ON) - option(MI_OSX_ZONE "Use malloc zone to override standard malloc on macOS" OFF) # enables interpose as well diff --git a/debian/patches/series b/debian/patches/series index 9a588ad..f2c1edd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01_RemoveGitHash.patch 20_use_system_flatbuffers.patch -30_use_cxx_for_mimalloc.patch