databases/foundationdb-devel: update to 20201228 snapshot

Sponsored by:	SkunkWerks, GmbH

5 files changed, 79 insertions, 0 deletions

diff --git a/databases/foundationdb-devel/files/patch-CMakeLists.txt b/databases/foundationdb-devel/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..0c56c01423fa
--- /dev/null
+++ b/databases/foundationdb-devel/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2020-12-28 05:52:45 UTC
++++ CMakeLists.txt
+@@ -164,7 +164,9 @@ endif()
+ add_subdirectory(fdbbackup)
+ add_subdirectory(contrib)
+ add_subdirectory(tests)
++if(WITH_FLOWBENCH)
+ add_subdirectory(flowbench EXCLUDE_FROM_ALL)
++endif()
+ if(WITH_PYTHON)
+   add_subdirectory(bindings)
+ endif()
diff --git a/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt
new file mode 100644
index 000000000000..37eb53835a66
--- /dev/null
+++ b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- bindings/c/CMakeLists.txt.orig	2020-12-28 05:52:45 UTC
++++ bindings/c/CMakeLists.txt
+@@ -100,8 +100,6 @@ if(NOT WIN32)
+   target_link_libraries(fdb_c_ryw_benchmark PRIVATE fdb_c)
+   target_link_libraries(fdb_c_txn_size_test PRIVATE fdb_c)
+ 
+-  add_dependencies(fdb_c_setup_tests doctest)
+-  add_dependencies(fdb_c_unit_tests doctest)
+   target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+   target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
+   target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads)
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
new file mode 100644
index 000000000000..52509e221e6b
--- /dev/null
+++ b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt
@@ -0,0 +1,22 @@
+--- bindings/c/test/unit/third_party/CMakeLists.txt.orig	2021-01-04 00:07:51 UTC
++++ bindings/c/test/unit/third_party/CMakeLists.txt
+@@ -1,18 +1 @@
+-# Download doctest repo.
+-include(ExternalProject)
+-find_package(Git REQUIRED)
+-
+-ExternalProject_Add(
+-    doctest
+-    PREFIX ${CMAKE_BINARY_DIR}/doctest
+-    GIT_REPOSITORY https://github.com/onqtam/doctest.git
+-    GIT_TAG 1c8da00c978c19e00a434b2b1f854fcffc9fba35 # v2.4.0
+-    TIMEOUT 10
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND ""
+-    LOG_DOWNLOAD ON
+-)
+-
+-ExternalProject_Get_Property(doctest source_dir)
+-set(DOCTEST_INCLUDE_DIR ${source_dir}/doctest CACHE INTERNAL "Path to include folder for doctest")
++set(DOCTEST_INCLUDE_DIR /usr/local/include/doctest CACHE INTERNAL "Path to include folder for doctest")
diff --git a/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp b/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp
new file mode 100644
index 000000000000..85557d8234f2
--- /dev/null
+++ b/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp
@@ -0,0 +1,11 @@
+--- flow/Platform.actor.cpp.orig	2021-01-03 23:00:51 UTC
++++ flow/Platform.actor.cpp
+@@ -2406,7 +2406,7 @@ ACTOR Future<vector<std::string>> findFiles( std::stri
+ 	return result;
+ }
+ 
+-#elif (defined(__linux__) || defined(__APPLE__))
++#elif (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
+ #define FILE_ATTRIBUTE_DATA mode_t
+ 
+ bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, std::string const& name, std::string const& extension ) {
diff --git a/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h b/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h
new file mode 100644
index 000000000000..fe00d9506ec2
--- /dev/null
+++ b/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h
@@ -0,0 +1,23 @@
+--- flow/ThreadPrimitives.h.orig	2021-01-03 22:45:20 UTC
++++ flow/ThreadPrimitives.h
+@@ -47,9 +47,9 @@
+ 
+ // TODO: We should make this dependent on the CPU. Maybe cmake
+ // can set this variable properly?
+-constexpr size_t CACHE_LINE_SIZE = 64;
++constexpr size_t MAX_CACHE_LINE_SIZE = 64;
+ 
+-class alignas(CACHE_LINE_SIZE) ThreadSpinLock {
++class alignas(MAX_CACHE_LINE_SIZE) ThreadSpinLock {
+ public:
+ // #ifdef _WIN32
+ 	ThreadSpinLock() {
+@@ -90,7 +90,7 @@ class alignas(CACHE_LINE_SIZE) ThreadSpinLock { (priva
+ 	std::atomic_flag isLocked = ATOMIC_FLAG_INIT;
+ 	// We want a spin lock to occupy a cache line in order to
+ 	// prevent false sharing.
+-	std::array<uint8_t, CACHE_LINE_SIZE - sizeof(isLocked)> padding;
++	std::array<uint8_t, MAX_CACHE_LINE_SIZE - sizeof(isLocked)> padding;
+ };
+ 
+ class ThreadSpinLockHolder {