Date: Wed, 29 May 2024 20:20:07 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7ff7e9bd4ef8 - main - security/botan3: Optimize build, add TEST_TARGET Message-ID: <202405292020.44TKK7BE077443@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ff7e9bd4ef8a5b70ba3f6095b9291c83766c23e commit 7ff7e9bd4ef8a5b70ba3f6095b9291c83766c23e Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2024-05-19 21:45:13 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2024-05-29 07:05:30 +0000 security/botan3: Optimize build, add TEST_TARGET - relax LLVM requirement, per PR #279136, any llvm from ports can compile botan3 - pass --compiler-cache if CCACHE_BIN is nonempty to actually make use of ccache - replace boost-libs LIB_DEPENDS=libboost_filesystem.so by BUILD_DEPENDS=...asio.hpp to make purpose clearer and avoid the stage-qa warning that libboost_filesystem.so is unused. - add TEST_TARGET for "make test" and WITH_TESTING[_PORTS]. - strip support for FreeBSD before 1300000, end of life. PR: 279173 Approved by: fluffy@ (maintainer) --- security/botan3/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/security/botan3/Makefile b/security/botan3/Makefile index 1fcd76593800..645b97f019a2 100644 --- a/security/botan3/Makefile +++ b/security/botan3/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/license.txt BUILD_DEPENDS= ${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs -USES= compiler:c++20-lang cpe gmake llvm:17 shebangfix tar:xz # llvm:17 fixes build failure, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279136 +USES= compiler:c++20-lang cpe gmake llvm shebangfix tar:xz # llvm fixes build failure, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279136 CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= yes @@ -23,6 +23,7 @@ SHEBANG_GLOB= *.py HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.py CONFIGURE_ARGS= --cc=${CHOSEN_COMPILER_TYPE} \ + ${"${CCACHE_BIN}" != "":?--compiler-cache=${CCACHE_BIN}:} \ --prefix=${PREFIX:Q} \ --with-boost \ --with-bzip2 \ @@ -31,6 +32,7 @@ CONFIGURE_ARGS= --cc=${CHOSEN_COMPILER_TYPE} \ --with-lzma \ --with-zlib \ --program-suffix=${_BOTANMAJOR} +TEST_TARGET= check LDFLAGS+= -pthread DOCSDIR= ${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION} @@ -80,10 +82,6 @@ PLIST_SUB+= HAS_PROCESSOR_RNG="" PLIST_SUB+= HAS_PROCESSOR_RNG="@comment " .endif -#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ) || ${OSVERSION} < 1300000 ) -#USES+= llvm:max=15,min=14 -#.endif - .if ${OPSYS} == FreeBSD && ( ( ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091 ) || ( ${OSVERSION} < 1302507 ) ) # libc++ does not carry std::ranges::find, redirect to boost::range::find: EXTRA_PATCHES+= ${FILESDIR}/extrapatch-src_tests_unit__x509.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405292020.44TKK7BE077443>