Index: head/databases/foundationdb-devel/Makefile =================================================================== --- head/databases/foundationdb-devel/Makefile (revision 569454) +++ head/databases/foundationdb-devel/Makefile (revision 569455) @@ -1,87 +1,90 @@ # $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 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 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 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 DBDIR?= /var/db/foundationdb LOGDIR?= /var/log/foundationdb SUB_FDB= DB_USER=${USERS} \ DB_GROUP=${GROUPS} \ DB_DIR=${DBDIR} \ LOG_DIR=${LOGDIR} SUB_FILES+= foundationdb.conf SUB_LIST+= ${SUB_FDB} 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 \ actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \ fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor # confirm with upstream if these are actually needed .for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore ${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s} .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 # exposed headers - confirm with upstream ${MKDIR} ${STAGEDIR}${PREFIX}/include/foundationdb ${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c.h \ ${STAGEDIR}/${PREFIX}/include/foundationdb/ ${INSTALL_DATA} ${WRKSRC}/fdbclient/vexillographer/fdb.options \ ${STAGEDIR}/${PREFIX}/include/foundationdb/ ${INSTALL_DATA} ${WRKDIR}/.build/bindings/c/foundationdb/fdb_c_options.g.h \ ${STAGEDIR}/${PREFIX}/include/foundationdb/ # runtime related ${MKDIR} ${STAGEDIR}${DBDIR} \ ${STAGEDIR}${LOGDIR} \ ${STAGEDIR}${PREFIX}/etc/foundationdb ${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \ ${STAGEDIR}${PREFIX}/etc/foundationdb/foundationdb.conf.sample .include Index: head/databases/foundationdb-devel/distinfo =================================================================== --- head/databases/foundationdb-devel/distinfo (revision 569454) +++ head/databases/foundationdb-devel/distinfo (revision 569455) @@ -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 Index: head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h =================================================================== --- head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h (revision 569454) +++ head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h (nonexistent) @@ -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 { Property changes on: head/databases/foundationdb-devel/files/patch-flow_ThreadPrimitives.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -files/patch-bindings_c_CMakeLists.txt \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp =================================================================== --- head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp (revision 569454) +++ head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp (nonexistent) @@ -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 ) { Property changes on: head/databases/foundationdb-devel/files/patch-flow_Platform.actor.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -files/patch-bindings_c_CMakeLists.txt \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/foundationdb-devel/pkg-plist =================================================================== --- head/databases/foundationdb-devel/pkg-plist (revision 569454) +++ head/databases/foundationdb-devel/pkg-plist (revision 569455) @@ -1,27 +1,26 @@ @dir(%%DB_USER%%,%%DB_GROUP%%,) %%DB_DIR%% @dir(%%DB_USER%%,%%DB_GROUP%%,) %%LOG_DIR%% @sample etc/foundationdb/foundationdb.conf.sample bin/actor_flamegraph bin/backup_agent bin/dr_agent bin/fdb_c_performance_test bin/fdb_c_ryw_benchmark bin/fdb_c_txn_size_test bin/fdb_flow_tester bin/fdbbackup bin/fdbcli bin/fdbmonitor bin/fdbr bin/fdbrestore bin/fdbserver bin/mako include/foundationdb/fdb.options include/foundationdb/fdb_c.h include/foundationdb/fdb_c_options.g.h lib/libfdb_c.so lib/libfdb_flow.a lib/libfdb_sqlite.a lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -lib/libthirdparty.a