diff options
author | Pavel Balaev <balaev@tarantool.org> | 2023-05-25 16:14:47 +0300 |
---|---|---|
committer | Gleb Popov <arrowd@FreeBSD.org> | 2023-05-25 19:32:53 +0300 |
commit | f07f24f98d48121a985d89be64d8a0db24921716 (patch) | |
tree | 4ee39e5802ebbc1508b642c3c97b8db2fd1266a7 /databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake | |
parent | accessibility/wlsunset: update to 0.3.0 (diff) |
databases/tarantool: Update to 2.11.0
The DEBUG option has been removed because backtraces do not work
correctly.
Diffstat (limited to 'databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake')
-rw-r--r-- | databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake b/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake deleted file mode 100644 index 2448e543e640..000000000000 --- a/databases/tarantool/files/patch-cmake-BuildLibUnwind.cmake +++ /dev/null @@ -1,29 +0,0 @@ ---- cmake/BuildLibUnwind.cmake.orig 2022-11-14 13:17:09.046425000 +0100 -+++ cmake/BuildLibUnwind.cmake 2022-11-14 13:18:30.382852000 +0100 -@@ -18,6 +18,11 @@ - The paths to the libunwind libraries. - #]========================================================================] - -+set(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR}) -+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND SYSTEM_ARCH STREQUAL amd64) -+ set(SYSTEM_ARCH x86_64) -+endif() -+ - macro(libunwind_build) - set(LIBUNWIND_SOURCE_DIR ${PROJECT_SOURCE_DIR}/third_party/libunwind) - set(LIBUNWIND_BUILD_DIR ${PROJECT_BINARY_DIR}/build/libunwind) -@@ -91,12 +96,12 @@ - add_library(bundled-libunwind-platform STATIC IMPORTED GLOBAL) - set_target_properties(bundled-libunwind-platform PROPERTIES - IMPORTED_LOCATION -- ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a) -+ ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a) - add_dependencies(bundled-libunwind-platform bundled-libunwind-project) - - set(LIBUNWIND_INCLUDE_DIR ${LIBUNWIND_INSTALL_DIR}/include) - set(LIBUNWIND_LIBRARIES -- ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${CMAKE_SYSTEM_PROCESSOR}.a -+ ${LIBUNWIND_INSTALL_DIR}/lib/libunwind-${SYSTEM_ARCH}.a - ${LIBUNWIND_INSTALL_DIR}/lib/libunwind.a) - - message(STATUS "Using bundled libunwind") |