diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile index 04453c48deee..9fbf62b8f766 100644 --- a/databases/foundationdb/Makefile +++ b/databases/foundationdb/Makefile @@ -1,100 +1,98 @@ PORTNAME= foundationdb -DISTVERSION= 7.1.25 -PORTREVISION= 1 +DISTVERSION= 7.1.29 CATEGORIES= databases # PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/ MAINTAINER= dch@FreeBSD.org COMMENT= Distributed, transactional key-value store WWW= https://www.foundationdb.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to configure BROKEN_aarch64= invalid asm rdtsc ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything else BUILD_DEPENDS= ${LOCALBASE}/include/msgpack.hpp:devel/msgpack-cxx \ ${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= cmake compiler:c++17-lang mono:build python:build shebangfix \ +USES= cmake compiler:c++20-lang mono:build python:build shebangfix \ ssl USE_GITHUB= yes GH_ACCOUNT= apple GH_PROJECT= foundationdb USE_LDCONFIG= yes USE_RC_SUBR= foundationdb SHEBANG_FILES= bindings/c/generate_asm.py CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB} CMAKE_OFF= DISABLE_TLS USE_DTRACE USE_JEMALLOC WITH_CONTRIB WITH_FLOWBENCH MAKE_ENV= MONO_REGISTRY_PATH=/tmp/registry SUB_FILES= foundationdb.conf SUB_LIST= ${SUB_FDB} USERS= foundationdb GROUPS= foundationdb PLIST_SUB= ${SUB_FDB} FOUNDATIONDB_DBDIR?= /var/db/foundationdb FOUNDATIONDB_ETCDIR?= ${PREFIX}/etc/foundationdb FOUNDATIONDB_GROUP?= foundationdb FOUNDATIONDB_LOGDIR?= /var/log/foundationdb FOUNDATIONDB_USER?= foundationdb SUB_FDB= FOUNDATIONDB_DBDIR=${FOUNDATIONDB_DBDIR} \ FOUNDATIONDB_ETCDIR=${FOUNDATIONDB_ETCDIR} \ FOUNDATIONDB_GROUP=${FOUNDATIONDB_GROUP} \ FOUNDATIONDB_LOGDIR=${FOUNDATIONDB_LOGDIR} \ FOUNDATIONDB_USER=${FOUNDATIONDB_USER} post-patch: ${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \ ${WRKSRC}/cmake/FDBComponents.cmake ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/bindings/c/test/unit/third_party/CMakeLists.txt do-install: # commands on first line, dev tools on next two .for f in fdbbackup fdbcli fdbmonitor fdbserver actor_flamegraph fdb_flow_tester \ fdbconvert fdbdecode tutorial ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor .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 ${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}/bindings/c/foundationdb/fdb_c_types.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}${FOUNDATIONDB_ETCDIR} ${MKDIR} ${STAGEDIR}${FOUNDATIONDB_DBDIR} ${MKDIR} ${STAGEDIR}${FOUNDATIONDB_LOGDIR} ${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \ ${STAGEDIR}${FOUNDATIONDB_ETCDIR}/foundationdb.conf.sample .include diff --git a/databases/foundationdb/distinfo b/databases/foundationdb/distinfo index 902fdaf207b6..8315c830cce1 100644 --- a/databases/foundationdb/distinfo +++ b/databases/foundationdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668350492 -SHA256 (apple-foundationdb-7.1.25_GH0.tar.gz) = 0c4679afb982932dfa37cbb7544eee4c8efc2409864af55743345c153407cb2c -SIZE (apple-foundationdb-7.1.25_GH0.tar.gz) = 11657831 +TIMESTAMP = 1679567621 +SHA256 (apple-foundationdb-7.1.29_GH0.tar.gz) = ad608ddb781eea3ef4607ab9abb41282ca93383814d8149346bf3440cc9f46d5 +SIZE (apple-foundationdb-7.1.29_GH0.tar.gz) = 11676677 diff --git a/databases/foundationdb/files/patch-cmake_FDBComponents.cmake b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake index 556fe68a9257..815778f2df3a 100644 --- a/databases/foundationdb/files/patch-cmake_FDBComponents.cmake +++ b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake @@ -1,34 +1,34 @@ ---- cmake/FDBComponents.cmake.orig 2022-09-19 11:42:41 UTC +--- cmake/FDBComponents.cmake.orig 2023-03-14 19:59:33 UTC +++ cmake/FDBComponents.cmake -@@ -24,7 +24,7 @@ else() +@@ -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) if(WIN32) set(OPENSSL_MSVC_STATIC_RT ON) endif() -@@ -198,6 +198,13 @@ endif() +@@ -201,6 +201,13 @@ else() endif() ################################################################################ +# misc optional components +################################################################################ + +set(WITH_CONTRIB ON) +set(WITH_FLOWBENCH OFF) + +################################################################################ # Coroutine implementation ################################################################################ -@@ -242,6 +249,8 @@ function(print_components) +@@ -245,6 +252,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 "Build with AWS SDK: ${WITH_AWS_BACKUP}") message(STATUS "=========================================") diff --git a/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake index dee8066686d4..a0bff5b82bf3 100644 --- a/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake +++ b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake @@ -1,24 +1,24 @@ --- cmake/GetMsgpack.cmake.orig 2022-09-19 11:42:41 UTC +++ cmake/GetMsgpack.cmake @@ -1,20 +1,7 @@ -find_package(msgpack 3.3.0 EXACT QUIET CONFIG) -+find_package(msgpack REQUIRED QUIET CONFIG) ++find_package(msgpack-cxx REQUIRED QUIET CONFIG) add_library(msgpack INTERFACE) if(msgpack_FOUND) target_link_libraries(msgpack INTERFACE msgpackc-cxx) -else() - include(ExternalProject) - ExternalProject_add(msgpackProject - URL "https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz" - URL_HASH SHA256=6e114d12a5ddb8cb11f669f83f32246e484a8addd0ce93f274996f1941c1f07b - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - ) - - ExternalProject_Get_property(msgpackProject SOURCE_DIR) - target_include_directories(msgpack SYSTEM INTERFACE "${SOURCE_DIR}/include") - add_dependencies(msgpack msgpackProject) endif()