From nobody Sun May 22 20:17:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AF0571B4AA8D; Sun, 22 May 2022 20:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L5sFy27Wtz3h8c; Sun, 22 May 2022 20:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653250662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eiwzlWLd/EuHetCYsicbqqKQBROFU4j0QkbEkzCWtiE=; b=PzWXDpfijFq0ihlGT1ZV+1zwq49+sXiXzankRUflkTtFksPIZ0iDdoPAm823Ryqj1gbL+V ffRXUIhA+OQSATrzLAw1i1tVDta9NYtH/j12G0OOhcfLz2GGsEFC3KX/mU74pyUw44UPaj 4CHzbLQ50yZdO4hkyjVdZOH2odqLK0kve5G77OYrquQa3TWDJhIVQZzlcUIq4ELRLFrWQS SXdy4H6dhHh5tFgXU53vwhfsgD1H/JqRLaWiAB+Dvl9ugcXfdTddXhr37Xn7ff2jMdsh+e CX6C7T4O5M8lxwuOXN4DP3DfkDCrAkkM0HoG5gHHkVNch5CYNoXPKvuyv+eaCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58D7C21BEB; Sun, 22 May 2022 20:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24MKHfwc092304; Sun, 22 May 2022 20:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24MKHfW5092303; Sun, 22 May 2022 20:17:41 GMT (envelope-from git) Date: Sun, 22 May 2022 20:17:41 GMT Message-Id: <202205222017.24MKHfW5092303@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 32bfbcbbca3d - main - databases/foundationdb*: upbreak after boost upgrade (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32bfbcbbca3d614080c3a15f0e7d2bce96586178 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653250662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eiwzlWLd/EuHetCYsicbqqKQBROFU4j0QkbEkzCWtiE=; b=SrRll93vHyIJBuaXG6DBo/BPH0ScxdmSqMbLzwC7ZDSrOEapNA0cichi2yHqAfA3JiMvif emeyPVou2iNKSi91NODUP/1k3ggb8LmsyERdJeP8ODH+bmtlLSlKi/TwvK5wxebbl8COUh ViwoDuAs9KfhF5IPoLKu6hbHIfLhTdRGzZZA5CeYWMIYywVeGUVHiu8x11dSZfen0QBTBS eRkSa7D26DHVNT48BDyZamtM0PUmRt2j0IUrtJJpHvBobm9CIVrlABENgQ26HzBAMXSrBV tok/3+MvIGGhcwrt0CwBXyiR40kSESAFLtPrHip+I94U/5V65iiteDGSEKdTTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653250662; a=rsa-sha256; cv=none; b=xNI4Uhl73nqOAp+uigWB3iR/PAVgaqflnGxBp+zUF6C7wIIzrHJsSQn1FC+3HDhAS91Mz0 A+bL9cuGSySObTEdUeABkGjH6ej7FvpDVtg/HT9jZqdipt7y2aGCYgmJeAKdpkrWD1cC/I HBS547A6rrheo2LASLho90MwFcReHH0VlTG5wsb5l4e1+77ZAM/H6bJkpAZzETBmwkUp08 DhW4JcUllbp4vyGET+ZXxJBuXY+jtwoTHRzoqcnWHxr0SOakludhN2wWF4gbP0MZ6wL6nh xDAC9CgzmkCYXVMBjKCm7dZzlYLClNLldj8lxbf5rmiwAL+ev/dCH4oO2+dX4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=32bfbcbbca3d614080c3a15f0e7d2bce96586178 commit 32bfbcbbca3d614080c3a15f0e7d2bce96586178 Author: Dima Panov AuthorDate: 2022-05-22 18:33:24 +0000 Commit: Dima Panov CommitDate: 2022-05-22 20:17:04 +0000 databases/foundationdb*: upbreak after boost upgrade (+) While here, replace hardcoded /usr/local by %%LOCALBASE%% macro PR: 246106 --- databases/foundationdb-devel/Makefile | 3 +++ .../patch-bindings_c_test_unit_third__party_CMakeLists.txt | 2 +- .../foundationdb-devel/files/patch-cmake_CompileBoost.cmake | 11 +++++++++++ databases/foundationdb/Makefile | 3 +++ .../patch-bindings_c_test_unit_third__party_CMakeLists.txt | 2 +- databases/foundationdb/files/patch-cmake_CompileBoost.cmake | 11 +++++++++++ 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)