diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2022-05-22 21:33:24 +0300 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2022-05-22 23:17:04 +0300 |
| commit | 32bfbcbbca3d614080c3a15f0e7d2bce96586178 (patch) | |
| tree | 738e39175fbce8e3f9d3b2771c0acc2c32b099f3 /databases/foundationdb-devel/files | |
| parent | databases/mongodb42: switch to bundled old boost (diff) | |
databases/foundationdb*: upbreak after boost upgrade (+)
While here, replace hardcoded /usr/local by %%LOCALBASE%% macro
PR: 246106
Diffstat (limited to 'databases/foundationdb-devel/files')
| -rw-r--r-- | databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | databases/foundationdb-devel/files/patch-cmake_CompileBoost.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt index 4deeb8410767..23838e3972e5 100644 --- a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt +++ b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt @@ -19,4 +19,4 @@ - -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") ++set(DOCTEST_INCLUDE_DIR %%LOCALBASE%%/include/doctest CACHE INTERNAL "Path to include folder for doctest") diff --git a/databases/foundationdb-devel/files/patch-cmake_CompileBoost.cmake b/databases/foundationdb-devel/files/patch-cmake_CompileBoost.cmake new file mode 100644 index 000000000000..de9f48861488 --- /dev/null +++ b/databases/foundationdb-devel/files/patch-cmake_CompileBoost.cmake @@ -0,0 +1,11 @@ +--- cmake/CompileBoost.cmake.orig 2022-04-19 01:08:48 UTC ++++ cmake/CompileBoost.cmake +@@ -113,7 +113,7 @@ endif() + return() + endif() + +-find_package(Boost 1.72.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS}) ++find_package(Boost 1.72.0 COMPONENTS context 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) |