From nobody Fri Jan 03 00:48:13 2025 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 4YPQ0s68LFz5kBNY; Fri, 03 Jan 2025 00:48:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPQ0s4Rfxz4K1c; Fri, 3 Jan 2025 00:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735865293; 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=RhueNefzjTUpv0OFIabnDob+BXxtvd6R3oBST6JyYjA=; b=FrjW46bW6CPZ6oqK0CkFePlSrXTins7nXWEbN0zGpYnBtODRZJ6TCq6046U44/4d/9i/De wxE2JVI7c6MMLF+9I23qekP4hCjcoyQkDd7FyAeCuEmK9OnsP+ffzDD4uAwJvzfXUHJws2 +/VRk4L9z6rtIVayqYL2i7521GHiAFBeo7LfCrOwuADltBkytbk/N8aa8z2ZR3SdgIqjLd BctjY2IIvw1I7siPPYJ6ciV3zo7ryfXkOKhINCwZK/AMz66AsVXlNgZfyLmjsyV6l1ghXd jnAyifwN6t0WZZ2kc47iG9F3TzZ2W6fPqVNMr7r4qBkm/689TM4YzIkDM3YTmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735865293; 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=RhueNefzjTUpv0OFIabnDob+BXxtvd6R3oBST6JyYjA=; b=W6ZZmcWc8HV6p+zYKQBjBfnlZ9JGWxRUV+OLw0c87NMF9O6Rb6QLoZHjR9VVIGiyBZuM+O zbHCzXU+ZJjIGluR9ILvMLGIkDBpy2UIMCaLaUf5NfWvU19bxdz5dl9nL6mAt/niqQG5iB jw/Q+8O1JUuSbLeJi9N3+9Z6tFnrmsX6Ty3/Wd1GOUhnlkg2RUpOaKu49BbToFtEP/YWg+ W3e199fmg7uh+c1LgnlILrrJwXpZn4o1RHglqojN9Y4DEIMP7Gxb9NxqXEbhxjBkJXQ0LM +IYWkQSCupM1Xo4Ojq7vNuOdY4Ln1ZOJJY5Lk3Sre6iGseKnPB/H4V+7jgLGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735865293; a=rsa-sha256; cv=none; b=Pf2vQXXTkTDjtyRYF/p1RqHykZoOECx5tqG09clU113tHb4dx4qLFVL6p2kStdl1EJc7NH MbLKu1re0pKFqHyX7P956S662QAPuI+xx5q33sjgw+vB0UF7ePULl3Ou1BrZxjn7SlOb02 bDHYfUbuQWxnO75Ayl7xVDmBjKBi8UZYkldFBBQyuBFl0XHSiqiy2i7SjF/dWpPL+CGfHh id3EhJk7/2tvrBoNUn1QA8VJHYjvuhd0O/W6/CrKO2JTNPE7QcZcoGWakQ40d95c6C3As3 barHkv8hh6cQpNV01tKV7RjmG/PSyeyA928xM7kWSLXWeyDiFttmOxgofmFnNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPQ0s3lqjz10GB; Fri, 03 Jan 2025 00:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5030mDfb079411; Fri, 3 Jan 2025 00:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5030mDJO079408; Fri, 3 Jan 2025 00:48:13 GMT (envelope-from git) Date: Fri, 3 Jan 2025 00:48:13 GMT Message-Id: <202501030048.5030mDJO079408@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: f661b45b56e1 - main - devel/llvm-cheri: minor tidying [NFC] 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f661b45b56e14b1540d47a7c843277c37e025941 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f661b45b56e14b1540d47a7c843277c37e025941 commit f661b45b56e14b1540d47a7c843277c37e025941 Author: Brooks Davis AuthorDate: 2025-01-03 00:31:11 +0000 Commit: Brooks Davis 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