From 65ceac45ccb365e4b6bc7e54c14c6246a125a616 Mon Sep 17 00:00:00 2001 From: Dave Cottlehuber Date: Mon, 29 Mar 2021 09:27:33 +0000 Subject: databases/foundationdb-devel: update to 20210224 snapshot Sponsored by: SkunkWerks, GmbH --- databases/foundationdb-devel/Makefile | 11 +++++++---- databases/foundationdb-devel/distinfo | 8 +++++--- .../files/patch-flow_Platform.actor.cpp | 11 ----------- .../files/patch-flow_ThreadPrimitives.h | 23 ---------------------- databases/foundationdb-devel/pkg-plist | 1 - 5 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp delete mode 100644 databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h (limited to 'databases') diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile index f860d5143937..f86d1c7db8ba 100644 --- a/databases/foundationdb-devel/Makefile +++ b/databases/foundationdb-devel/Makefile @@ -1,9 +1,12 @@ # $FreeBSD$ PORTNAME= foundationdb-devel -DISTVERSION= 7.0.0.a.20201228 +DISTVERSION= 7.0.0.a.20210224 CATEGORIES= databases +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/ +PATCHFILES+= 4373.patch:-p1 # https://github.com/apple/foundationdb/pull/4373 + MAINTAINER= dch@FreeBSD.org COMMENT= Distributed, transactional key-value store @@ -25,14 +28,14 @@ USES= compiler:c++17-lang cmake mono:build python:build shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= apple GH_PROJECT= foundationdb -GH_TAGNAME= c895049 +GH_TAGNAME= 8580250 USE_LDCONFIG= yes USE_RC_SUBR= foundationdb SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} -CMAKE_OFF= USE_DTRACE DISABLE_TLS +CMAKE_OFF= USE_DTRACE DISABLE_TLS USE_JEMALLOC USERS= foundationdb GROUPS= foundationdb @@ -65,7 +68,7 @@ do-install: .endfor # exposed libraries - confirm with upstream .for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \ - libfdbrpc.a libflow.a libthirdparty.a + libfdbrpc.a libflow.a ${STRIP_CMD} ${WRKDIR}/.build/lib/${l} ${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/ .endfor diff --git a/databases/foundationdb-devel/distinfo b/databases/foundationdb-devel/distinfo index 25e0b3481f1f..f5352299a4b2 100644 --- a/databases/foundationdb-devel/distinfo +++ b/databases/foundationdb-devel/distinfo @@ -1,3 +1,5 @@ -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 +TIMESTAMP = 1614158402 +SHA256 (apple-foundationdb-7.0.0.a.20210224-8580250_GH0.tar.gz) = c5ea44f8a572dc51d1d983b63f33823c0f3ef61bc2cf4e21b526ffe2335725f2 +SIZE (apple-foundationdb-7.0.0.a.20210224-8580250_GH0.tar.gz) = 9697782 +SHA256 (4373.patch) = 88281a9e5b431f06da541e22c5a34f7846c198016ecbad227d3037cf58e5f0de +SIZE (4373.patch) = 945 diff --git a/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp b/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp deleted file mode 100644 index 85557d8234f2..000000000000 --- a/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- flow/Platform.actor.cpp.orig 2021-01-03 23:00:51 UTC -+++ flow/Platform.actor.cpp -@@ -2406,7 +2406,7 @@ ACTOR Future> 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 deleted file mode 100644 index fe00d9506ec2..000000000000 --- a/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 padding; -+ std::array padding; - }; - - class ThreadSpinLockHolder { diff --git a/databases/foundationdb-devel/pkg-plist b/databases/foundationdb-devel/pkg-plist index 21278e3b27a2..3f01481e1157 100644 --- a/databases/foundationdb-devel/pkg-plist +++ b/databases/foundationdb-devel/pkg-plist @@ -24,4 +24,3 @@ lib/libfdb_sqlite.a lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -lib/libthirdparty.a -- cgit v1.2.3