diff options
Diffstat (limited to 'databases/foundationdb-devel/files')
4 files changed, 51 insertions, 11 deletions
diff --git a/databases/foundationdb-devel/files/patch-CMakeLists.txt b/databases/foundationdb-devel/files/patch-CMakeLists.txt index 2d01b2f6d826..c39b3c3eb46e 100644 --- a/databases/foundationdb-devel/files/patch-CMakeLists.txt +++ b/databases/foundationdb-devel/files/patch-CMakeLists.txt @@ -1,11 +1,17 @@ ---- CMakeLists.txt.orig 2021-11-25 00:33:05 UTC +--- CMakeLists.txt.orig 2021-12-29 09:04:08 UTC +++ CMakeLists.txt -@@ -171,7 +171,9 @@ else() +@@ -172,9 +172,13 @@ else() + add_subdirectory(fdbservice) endif() add_subdirectory(fdbbackup) +-add_subdirectory(contrib) ++if(WITH_CONTRIB) ++ add_subdirectory(contrib) ++endif() add_subdirectory(tests) +-add_subdirectory(flowbench EXCLUDE_FROM_ALL) +if(WITH_FLOWBENCH) - add_subdirectory(flowbench EXCLUDE_FROM_ALL) ++ add_subdirectory(flowbench EXCLUDE_FROM_ALL) +endif() if(WITH_PYTHON AND WITH_C_BINDING) add_subdirectory(bindings) diff --git a/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt index febacf79505c..c05798bb5aaa 100644 --- a/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt +++ b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt @@ -1,11 +1,11 @@ ---- bindings/c/CMakeLists.txt.orig 2021-11-25 00:33:05 UTC +--- bindings/c/CMakeLists.txt.orig 2021-12-29 13:15:46 UTC +++ bindings/c/CMakeLists.txt -@@ -77,7 +77,7 @@ endif() - # The tests don't build on windows and ARM macs - # doctest doesn't seem to compile on ARM macs, we should - # check later whether this works --if(NOT WIN32 AND NOT IS_ARM_MAC) -+if(NOT WIN32 AND NOT IS_ARM_MAC AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -65,7 +65,7 @@ if(WIN32) + endif() + + # The tests don't build on windows +-if(NOT WIN32) ++if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(MAKO_SRCS test/mako/mako.c test/mako/mako.h diff --git a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt index 52509e221e6b..4deeb8410767 100644 --- a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt +++ b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt @@ -1,4 +1,4 @@ ---- bindings/c/test/unit/third_party/CMakeLists.txt.orig 2021-01-04 00:07:51 UTC +--- bindings/c/test/unit/third_party/CMakeLists.txt.orig 2021-12-07 03:03:34 UTC +++ bindings/c/test/unit/third_party/CMakeLists.txt @@ -1,18 +1 @@ -# Download doctest repo. diff --git a/databases/foundationdb-devel/files/patch-cmake_FDBComponents.cmake b/databases/foundationdb-devel/files/patch-cmake_FDBComponents.cmake new file mode 100644 index 000000000000..e4b75371774d --- /dev/null +++ b/databases/foundationdb-devel/files/patch-cmake_FDBComponents.cmake @@ -0,0 +1,34 @@ +--- cmake/FDBComponents.cmake.orig 2021-12-07 03:03:34 UTC ++++ cmake/FDBComponents.cmake +@@ -24,7 +24,7 @@ set(DISABLE_TLS OFF CACHE BOOL "Don't try to find Open + if(DISABLE_TLS) + set(WITH_TLS OFF) + else() +- set(OPENSSL_USE_STATIC_LIBS TRUE) ++ set(OPENSSL_USE_STATIC_LIBS FALSE) + find_package(OpenSSL) + if(OPENSSL_FOUND) + set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) +@@ -203,6 +203,13 @@ else() + endif() + + ################################################################################ ++# misc optional components ++################################################################################ ++ ++set(WITH_CONTRIB ON) ++set(WITH_FLOWBENCH OFF) ++ ++################################################################################ + # Coroutine implementation + ################################################################################ + +@@ -236,6 +243,8 @@ function(print_components) + message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}") + message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}") + message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}") ++ message(STATUS "Build contrib: ${WITH_CONTRIB}") ++ message(STATUS "Build with FlowBench: ${WITH_FLOWBENCH}") + message(STATUS "Build with RocksDB: ${WITH_ROCKSDB_EXPERIMENTAL}") + message(STATUS "=========================================") + endfunction() |