Attachment 241065 Details for Bug 269236 – foundationdb-7.2.5-wip

[patch] foundationdb-7.2.5-wip

foundationdb-72.diff (text/plain), 11.81 KB, created by Dmitry Wagin on 2023-03-23 12:55:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2023-03-23 12:55:45 UTC

Size: 11.81 KB

patch

obsolete

>diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile
>index 04453c48deee..b4637b47507c 100644
>--- a/databases/foundationdb/Makefile
>+++ b/databases/foundationdb/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	foundationdb
>-DISTVERSION=	7.1.25
>-PORTREVISION=	1
>+DISTVERSION=	7.2.5
> CATEGORIES=	databases
> 
> # PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
>@@ -12,7 +11,6 @@ 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
>@@ -24,8 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/msgpack.hpp:devel/msgpack-cxx \
> LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 		libeio.so:devel/libeio
> 
>-USES=		cmake compiler:c++17-lang mono:build python:build shebangfix \
>-		ssl
>+USES=		cmake compiler:c++20-lang mono:build python:build shebangfix ssl
> USE_GITHUB=	yes
> GH_ACCOUNT=	apple
> GH_PROJECT=	foundationdb
>@@ -35,7 +32,7 @@ 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
>+CMAKE_OFF=	DISABLE_TLS SSD_ROCKSDB_EXPERIMENTAL USE_DTRACE USE_JEMALLOC WITH_CONTRIB WITH_FLOWBENCH
> 
> MAKE_ENV=	MONO_REGISTRY_PATH=/tmp/registry
> 
>diff --git a/databases/foundationdb/distinfo b/databases/foundationdb/distinfo
>index 902fdaf207b6..3874eb49fdd2 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 = 1679142114
>+SHA256 (apple-foundationdb-7.2.5_GH0.tar.gz) = 78b9e071a61ad08b1652c87706d1fa772c4091041f5f9387afeda5a9f1f21ef9
>+SIZE (apple-foundationdb-7.2.5_GH0.tar.gz) = 12504328
>diff --git a/databases/foundationdb/files/patch-CMakeLists.txt b/databases/foundationdb/files/patch-CMakeLists.txt
>index 78d6244a990c..a5801be60ad0 100644
>--- a/databases/foundationdb/files/patch-CMakeLists.txt
>+++ b/databases/foundationdb/files/patch-CMakeLists.txt
>@@ -1,13 +1,19 @@
>---- CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
>+--- CMakeLists.txt.orig	2023-01-18 18:54:50 UTC
> +++ CMakeLists.txt
>-@@ -183,9 +183,13 @@ add_subdirectory(fdbbackup)
>-   add_subdirectory(fdbservice)
>- endif()
>- add_subdirectory(fdbbackup)
>+@@ -174,7 +174,9 @@ include(GetMsgpack)
>+ 
>+ include(CompileBoost)
>+ include(GetMsgpack)
> -add_subdirectory(contrib)
> +if(WITH_CONTRIB)
> +  add_subdirectory(contrib)
> +endif()
>+ add_subdirectory(flow)
>+ add_subdirectory(fdbrpc)
>+ add_subdirectory(fdbclient)
>+@@ -187,7 +189,9 @@ add_subdirectory(tests)
>+ endif()
>+ add_subdirectory(fdbbackup)
>  add_subdirectory(tests)
> -add_subdirectory(flowbench EXCLUDE_FROM_ALL)
> +if(WITH_FLOWBENCH)
>diff --git a/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt
>index 7c58fb132630..95fa54820a46 100644
>--- a/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt
>+++ b/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- bindings/c/CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
>+--- bindings/c/CMakeLists.txt.orig	2023-01-18 18:54:50 UTC
> +++ bindings/c/CMakeLists.txt
>-@@ -78,7 +78,7 @@ endif()
>+@@ -93,7 +93,7 @@ endif()
>  endif()
>  
>  # The tests don't build on windows
> -if(NOT WIN32)
> +if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>    set(MAKO_SRCS
>-     test/mako/mako.c
>-     test/mako/mako.h
>+     test/mako/async.hpp
>+     test/mako/async.cpp
>diff --git a/databases/foundationdb/files/patch-cmake_CompileBoost.cmake b/databases/foundationdb/files/patch-cmake_CompileBoost.cmake
>index c72e610786f0..9d8889f6fff9 100644
>--- a/databases/foundationdb/files/patch-cmake_CompileBoost.cmake
>+++ b/databases/foundationdb/files/patch-cmake_CompileBoost.cmake
>@@ -1,11 +1,11 @@
>---- cmake/CompileBoost.cmake.orig	2022-09-19 11:42:41 UTC
>+--- cmake/CompileBoost.cmake.orig	2023-01-18 18:54:50 UTC
> +++ cmake/CompileBoost.cmake
>-@@ -113,7 +113,7 @@ endif()
>+@@ -141,7 +141,7 @@ endif()
>    return()
>  endif()
>  
>--find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
>-+find_package(Boost 1.78.0 COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
>+-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context filesystem iostreams CONFIG PATHS ${BOOST_HINT_PATHS})
>++find_package(Boost 1.78.0 COMPONENTS context filesystem iostreams CONFIG PATHS ${BOOST_HINT_PATHS})
>  set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")
>  
>- if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)
>+ if(Boost_FOUND AND Boost_filesystem_FOUND AND Boost_context_FOUND AND Boost_iostreams_FOUND AND NOT FORCE_BOOST_BUILD)
>diff --git a/databases/foundationdb/files/patch-cmake_FDBComponents.cmake b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake
>index 556fe68a9257..2b3b78f914a4 100644
>--- a/databases/foundationdb/files/patch-cmake_FDBComponents.cmake
>+++ b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake
>@@ -1,15 +1,15 @@
>---- cmake/FDBComponents.cmake.orig	2022-09-19 11:42:41 UTC
>+--- cmake/FDBComponents.cmake.orig	2023-03-17 23:13:17 UTC
> +++ cmake/FDBComponents.cmake
>-@@ -24,7 +24,7 @@ else()
>- if(DISABLE_TLS)
>-   set(WITH_TLS OFF)
>- else()
>+@@ -35,7 +35,7 @@ if(USE_WOLFSSL)
>+     message(FATAL_ERROR "Unable to find WolfSSL")
>+   endif()
>+ elseif(USE_OPENSSL)
> -  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()
>+@@ -215,6 +215,13 @@ else()
>  endif()
>  
>  ################################################################################
>@@ -23,7 +23,7 @@
>  # Coroutine implementation
>  ################################################################################
>  
>-@@ -242,6 +249,8 @@ function(print_components)
>+@@ -258,6 +265,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}")
>diff --git a/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake
>index dee8066686d4..eab652df3a40 100644
>--- a/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake
>+++ b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake
>@@ -1,13 +1,13 @@
>---- cmake/GetMsgpack.cmake.orig	2022-09-19 11:42:41 UTC
>+--- cmake/GetMsgpack.cmake.orig	2023-01-18 18:54:50 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)
>+-  target_link_libraries(msgpack INTERFACE msgpackc-cxx)
> -else()
> -  include(ExternalProject)
> -  ExternalProject_add(msgpackProject
>@@ -21,4 +21,5 @@
> -  ExternalProject_Get_property(msgpackProject SOURCE_DIR)
> -  target_include_directories(msgpack SYSTEM INTERFACE "${SOURCE_DIR}/include")
> -  add_dependencies(msgpack msgpackProject)
>++  target_link_libraries(msgpack INTERFACE msgpack-cxx)
>  endif()
>diff --git a/databases/foundationdb/files/patch-fdbcli_CMakeLists.txt b/databases/foundationdb/files/patch-fdbcli_CMakeLists.txt
>new file mode 100644
>index 000000000000..530a11db1070
>--- /dev/null
>+++ b/databases/foundationdb/files/patch-fdbcli_CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- fdbcli/CMakeLists.txt.orig	2023-03-18 02:13:17.000000000 +0300
>++++ fdbcli/CMakeLists.txt
>+@@ -25,7 +25,7 @@
>+   endif()
>+ endif()
>+ 
>+-if (NOT WIN32 AND NOT OPEN_FOR_IDE)
>++if (NOT WIN32 AND NOT OPEN_FOR_IDE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
>+   add_dependencies(fdbcli external_client)
>+ 
>+   add_fdbclient_test(
>diff --git a/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt b/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt
>index 2b5912204a6a..5a78f1c4e052 100644
>--- a/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt
>+++ b/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- fdbmonitor/CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
>+--- fdbmonitor/CMakeLists.txt.orig	2023-01-18 18:54:50 UTC
> +++ fdbmonitor/CMakeLists.txt
>-@@ -56,8 +56,3 @@ endif()
>+@@ -59,8 +59,3 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/contrib/generate_pro
>    configure_file(${CMAKE_SOURCE_DIR}/contrib/generate_profile.sh
>      ${CMAKE_BINARY_DIR}/contrib/generate_profile.sh)
>  endif()
>diff --git a/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp b/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp
>deleted file mode 100644
>index 4950f7fd5e8b..000000000000
>--- a/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- fdbserver/FDBExecHelper.actor.cpp.orig	2022-09-19 11:42:41 UTC
>-+++ fdbserver/FDBExecHelper.actor.cpp
>-@@ -18,6 +18,14 @@
>-  * limitations under the License.
>-  */
>- 
>-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
>-+#define BOOST_SYSTEM_NO_LIB
>-+#define BOOST_DATE_TIME_NO_LIB
>-+#define BOOST_REGEX_NO_LIB
>-+#include <boost/process.hpp>
>-+#endif
>-+#include <boost/algorithm/string.hpp>
>-+
>- #include "flow/TLSConfig.actor.h"
>- #include "flow/Trace.h"
>- #include "flow/Platform.h"
>-@@ -33,14 +41,6 @@
>- #include "fdbserver/FDBExecHelper.actor.h"
>- #include "fdbserver/Knobs.h"
>- #include "fdbserver/RemoteIKeyValueStore.actor.h"
>--
>--#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
>--#define BOOST_SYSTEM_NO_LIB
>--#define BOOST_DATE_TIME_NO_LIB
>--#define BOOST_REGEX_NO_LIB
>--#include <boost/process.hpp>
>--#endif
>--#include <boost/algorithm/string.hpp>
>- 
>- #include "flow/actorcompiler.h" // This must be the last #include.
>- 
>diff --git a/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp b/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
>deleted file mode 100644
>index 1720825f36ac..000000000000
>--- a/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
>+++ /dev/null
>@@ -1,30 +0,0 @@
>---- fdbserver/fdbserver.actor.cpp.orig	2022-09-19 11:42:41 UTC
>-+++ fdbserver/fdbserver.actor.cpp
>-@@ -84,7 +84,11 @@
>- #if defined(__linux__) || defined(__FreeBSD__)
>- #include <execinfo.h>
>- #include <signal.h>
>-+#if defined(__linux__)
>- #include <sys/prctl.h>
>-+#elif defined(__FreeBSD__)
>-+#include <sys/procctl.h>
>-+#endif
>- #ifdef ALLOC_INSTRUMENTATION
>- #include <cxxabi.h>
>- #endif
>-@@ -2225,9 +2229,14 @@ int main(int argc, char* argv[]) {
>- 			f = result;
>- 		} else if (role == ServerRole::FlowProcess) {
>- 			TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
>--#if defined(__linux__) || defined(__FreeBSD__)
>-+#if defined(__linux__)
>- 			prctl(PR_SET_PDEATHSIG, SIGTERM);
>- 			if (getppid() == 1) /* parent already died before prctl */
>-+				flushAndExit(FDB_EXIT_SUCCESS);
>-+#elif defined(__FreeBSD__)
>-+			const int sig = SIGTERM;
>-+			procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
>-+			if (getppid() == 1) /* parent already died before procctl */
>- 				flushAndExit(FDB_EXIT_SUCCESS);
>- #endif
>- 
>diff --git a/databases/foundationdb/files/patch-flow_Platform.actor.cpp b/databases/foundationdb/files/patch-flow_Platform.actor.cpp
>new file mode 100644
>index 000000000000..db2fabf99473
>--- /dev/null
>+++ b/databases/foundationdb/files/patch-flow_Platform.actor.cpp
>@@ -0,0 +1,12 @@
>+--- flow/Platform.actor.cpp.orig	2023-03-18 02:13:17.000000000 +0300
>++++ flow/Platform.actor.cpp
>+@@ -1992,6 +1992,9 @@
>+ 	char** e = nullptr;
>+ #ifdef __linux__
>+ 	e = environ;
>++#elif defined(__FreeBSD__)
>++	extern char **environ;
>++	e = environ;
>+ #elif defined(__APPLE__)
>+ 	e = *_NSGetEnviron();
>+ #else

Actions: View | Diff

Attachments on bug 269236: 239795 | 240139 | 241064 | 241065 | 241105