ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-03 09:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update RocksDB to 6.5:

Browse Source 
* update EP and find package requirements
* minor protobuf/libarchive build fixes
* change travis release builds to nounity to
  ameliorate vm memory exhaustion.

FIXES: #3223, #3232
This commit is contained in:
Mike Ellery
2020-01-29 08:36:00 -08:00
committed by Manoj doshi
parent facb627786
commit 4315913a5d
7 changed files with 161 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Builds/CMake/deps/Libarchive.cmake
View File

@@ -3,7 +3,7 @@
#]===================================================================]
option (local_libarchive "use local build of libarchive." OFF)
add_library (archive_lib STATIC IMPORTED GLOBAL)
add_library (archive_lib UNKNOWN IMPORTED GLOBAL)
if (NOT local_libarchive)
if (NOT WIN32)
@@ -18,6 +18,15 @@ if (NOT local_libarchive)
${archive}
INTERFACE_INCLUDE_DIRECTORIES
${LIBARCHIVE_INCLUDE_DIR})
# pkg-config can return extra info for static lib linking
# this is probably needed/useful generally, but apply
# to APPLE for now (mostly for homebrew)
if (APPLE AND static AND libarchive_PC_STATIC_LIBRARIES)
message(STATUS "NOTE: libarchive static libs: ${libarchive_PC_STATIC_LIBRARIES}")
# also, APPLE seems to need iconv...maybe linux does too (TBD)
target_link_libraries (archive_lib
INTERFACE iconv ${libarchive_PC_STATIC_LIBRARIES})
endif ()
else ()
## now try searching using the minimal find module that cmake provides
find_package(LibArchive 3.3.3 QUIET)