Date: Fri, 3 Jan 2025 00:48:13 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f661b45b56e1 - main - devel/llvm-cheri: minor tidying [NFC] Message-ID: <202501030048.5030mDJO079408@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f661b45b56e14b1540d47a7c843277c37e025941 commit f661b45b56e14b1540d47a7c843277c37e025941 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2025-01-03 00:31:11 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2025-01-03 00:47:47 +0000 devel/llvm-cheri: minor tidying [NFC] Align license section with other devel/llvm* ports. Only add per-LLVM release patches if any exist. Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 3491ec5ae9dd..a8166c74d339 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -10,11 +10,11 @@ WWW?= https://cheri-cpu.org LICENSE_DIR= ${WRKSRC}/llvm .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE" -LICENSE:= ${LICENSE:NARM} LICENSE+= LLVM2 LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE:= ${LICENSE:NARM} NOT_FOR_ARCHS= i386 armv6 armv7 powerpc mips NOT_FOR_ARCHS_REASON= No one will develop CHERI from 32-bit @@ -113,7 +113,9 @@ STRIP_LIBS= BugpointPasses.so \ ${LIBNAME}.0 \ libLTO.so +.if exists(${PATCHDIR}/llvm${LLVM_MAJOR}) EXTRA_PATCHES+= ${PATCHDIR}/llvm${LLVM_MAJOR} +.endif .if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files) EXTRA_PATCHES+= ${.CURDIR}/files .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501030048.5030mDJO079408>