svn commit: r560493 - in head/databases/foundationdb-devel: . files
Dave Cottlehuber
dch at FreeBSD.org
Wed Jan 6 10:47:55 UTC 2021
Author: dch
Date: Wed Jan 6 10:47:52 2021
New Revision: 560493
URL: https://svnweb.freebsd.org/changeset/ports/560493
Log:
databases/foundationdb-devel: update to 20201228 snapshot
Sponsored by: SkunkWerks, GmbH
Added:
head/databases/foundationdb-devel/files/patch-CMakeLists.txt (contents, props changed)
head/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt (contents, props changed)
head/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt (contents, props changed)
head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp (contents, props changed)
head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h (contents, props changed)
Modified:
head/databases/foundationdb-devel/Makefile
head/databases/foundationdb-devel/distinfo
Modified: head/databases/foundationdb-devel/Makefile
==============================================================================
--- head/databases/foundationdb-devel/Makefile Wed Jan 6 10:13:58 2021 (r560492)
+++ head/databases/foundationdb-devel/Makefile Wed Jan 6 10:47:52 2021 (r560493)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= foundationdb-devel
-DISTVERSION= 7.0.0.a.20200515
+DISTVERSION= 7.0.0.a.20201228
CATEGORIES= databases
MAINTAINER= dch at FreeBSD.org
@@ -13,7 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64
-BUILD_DEPENDS= bash:shells/bash
+BUILD_DEPENDS= ${LOCALBASE}/include/doctest/doctest.h:devel/doctest \
+ ${LOCALBASE}/include/toml.hpp:devel/toml11 \
+ bash:shells/bash \
+ git:devel/git
+
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libeio.so:devel/libeio
@@ -21,7 +25,7 @@ USES= compiler:c++17-lang cmake mono:build python:bui
USE_GITHUB= yes
GH_ACCOUNT= apple
GH_PROJECT= foundationdb
-GH_TAGNAME= c1fc784
+GH_TAGNAME= c895049
USE_LDCONFIG= yes
USE_RC_SUBR= foundationdb
@@ -47,6 +51,7 @@ PLIST_SUB+= ${SUB_FDB}
post-patch:
${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
${WRKSRC}/cmake/FDBComponents.cmake
+
do-install:
# commands on first line, dev tools on next two
.for f in fdbbackup fdbcli fdbmonitor fdbserver \
Modified: head/databases/foundationdb-devel/distinfo
==============================================================================
--- head/databases/foundationdb-devel/distinfo Wed Jan 6 10:13:58 2021 (r560492)
+++ head/databases/foundationdb-devel/distinfo Wed Jan 6 10:47:52 2021 (r560493)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589833261
-SHA256 (apple-foundationdb-7.0.0.a.20200515-c1fc784_GH0.tar.gz) = 6cd6fd7dc95b18b8f2e8a400c556eebf8fb4d4392ddff4a954a4d175cd57ab13
-SIZE (apple-foundationdb-7.0.0.a.20200515-c1fc784_GH0.tar.gz) = 5425979
+TIMESTAMP = 1609716284
+SHA256 (apple-foundationdb-7.0.0.a.20201228-c895049_GH0.tar.gz) = bf49a6ddf40d01e3a27497c942b6ead91f3b53849a406971b20adc6b1f5297ce
+SIZE (apple-foundationdb-7.0.0.a.20201228-c895049_GH0.tar.gz) = 6381771
Added: head/databases/foundationdb-devel/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/foundationdb-devel/files/patch-CMakeLists.txt Wed Jan 6 10:47:52 2021 (r560493)
@@ -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()
Added: head/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt Wed Jan 6 10:47:52 2021 (r560493)
@@ -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)
Added: head/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt Wed Jan 6 10:47:52 2021 (r560493)
@@ -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")
Added: head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp Wed Jan 6 10:47:52 2021 (r560493)
@@ -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 ) {
Added: head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h Wed Jan 6 10:47:52 2021 (r560493)
@@ -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 {
More information about the svn-ports-all
mailing list