diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2022-05-22 18:33:24 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2022-05-22 20:17:04 +0000 |
| commit | 32bfbcbbca3d614080c3a15f0e7d2bce96586178 (patch) | |
| tree | 738e39175fbce8e3f9d3b2771c0acc2c32b099f3 | |
| parent | a1b52b8e4eab9b332129f4702dfcfbd8f8f19fea (diff) | |
| download | ports-32bfbcbbca3d614080c3a15f0e7d2bce96586178.tar.gz ports-32bfbcbbca3d614080c3a15f0e7d2bce96586178.zip | |
databases/foundationdb*: upbreak after boost upgrade (+)
While here, replace hardcoded /usr/local by %%LOCALBASE%% macro
PR: 246106
6 files changed, 30 insertions, 2 deletions
diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile index dbc3d4697f33..6848e474e235 100644 --- a/databases/foundationdb-devel/Makefile +++ b/databases/foundationdb-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= foundationdb-devel DISTVERSION= 7.0.0 +PORTREVISION= 1 CATEGORIES= databases # PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/ @@ -52,6 +53,8 @@ PLIST_SUB+= ${SUB_FDB} 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 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) diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile index fa05400cc7d0..08b8302dcee6 100644 --- a/databases/foundationdb/Makefile +++ b/databases/foundationdb/Makefile @@ -1,5 +1,6 @@ PORTNAME= foundationdb DISTVERSION= 7.0.0 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= dch@FreeBSD.org @@ -50,6 +51,8 @@ PLIST_SUB+= ${SUB_FDB} 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 diff --git a/databases/foundationdb/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt b/databases/foundationdb/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt index 4deeb8410767..23838e3972e5 100644 --- a/databases/foundationdb/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt +++ b/databases/foundationdb/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/files/patch-cmake_CompileBoost.cmake b/databases/foundationdb/files/patch-cmake_CompileBoost.cmake new file mode 100644 index 000000000000..de9f48861488 --- /dev/null +++ b/databases/foundationdb/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) |