Attachment 250821 Details for Bug 279173 – fix build on arm64/aarch64 by using LLVM 14 or 15 (not the base 16, which crashes)

[patch] fix build on arm64/aarch64 by using LLVM 14 or 15 (not the base 16, which crashes)

0001-security-botan3-Fix-and-optimize-build.patch (text/plain), 2.55 KB, created by Matthias Andree on 2024-05-19 22:57:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2024-05-19 22:57:38 UTC

Size: 2.55 KB

patch

obsolete

>From 84025d2650989d6aded7e08f5fab632bfc9af1f2 Mon Sep 17 00:00:00 2001
>From: Matthias Andree <mandree@FreeBSD.org>
>Date: Sun, 19 May 2024 23:45:13 +0200
>Subject: [PATCH 1/2] security/botan3: Fix and optimize build
>
>- reinstate older LLVM restriction to versions 14...15
>  to avoid clang-16 crash (PR #279136)
>- 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.
>---
> security/botan3/Makefile | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/security/botan3/Makefile b/security/botan3/Makefile
>index 64282de2bc4b..ad2fe9c93912 100644
>--- a/security/botan3/Makefile
>+++ b/security/botan3/Makefile
>@@ -12,11 +12,9 @@ WWW=		https://botan.randombit.net/
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/license.txt
> 
>-BROKEN_amd64=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279136
>-BROKEN_aarch64=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279136
> BROKEN_FreeBSD_13=	compilation fails: no member named 'find' in namespace 'std::ranges'
> 
>-LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
>+BUILD_DEPENDS=	${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs
> 
> USES=		compiler:c++20-lang cpe gmake shebangfix tar:xz
> CPE_VENDOR=	${PORTNAME}_project
>@@ -27,6 +25,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 \
>@@ -35,6 +34,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}
>@@ -84,9 +84,9 @@ 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} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ) )
>+USES+=	llvm:max=15,min=14
>+.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \
>-- 
>2.45.1
>

Actions: View | Diff

Attachments on bug 279173: 250821 | 250822 | 251052 | 251055