git: d17143d1b73e - main - devel/llvm*: don't define the ARM license [NFC]

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Fri, 03 Jan 2025 23:57:10 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d17143d1b73eee11b9196c2603636eebdcb8c2fe

commit d17143d1b73eee11b9196c2603636eebdcb8c2fe
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-03 01:55:40 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-03 23:56:56 +0000

    devel/llvm*: don't define the ARM license [NFC]
    
    All LLVM ports excluded it from the list as it was removed many years
    ago.
    
    Sponsored by:   DARPA, AFRL
---
 devel/llvm-cheri/Makefile         | 1 -
 devel/llvm-devel/Makefile         | 1 -
 devel/llvm-devel/Makefile.LICENSE | 6 +-----
 devel/llvm11/Makefile             | 1 -
 devel/llvm12/Makefile             | 1 -
 devel/llvm13/Makefile             | 1 -
 devel/llvm14/Makefile             | 1 -
 devel/llvm15/Makefile             | 1 -
 devel/llvm16/Makefile             | 1 -
 devel/llvm17/Makefile             | 1 -
 devel/llvm18/Makefile             | 1 -
 devel/llvm19/Makefile             | 1 -
 12 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 7002510f55b1..f136859697a3 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -10,7 +10,6 @@ WWW?=		https://cheri-cpu.org
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=       ${LICENSE:NARM}
 
 NOT_FOR_ARCHS=		i386 armv6 armv7 powerpc mips
 NOT_FOR_ARCHS_REASON=	No one will develop CHERI from 32-bit
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 353f72a2a735..e9b8c4c9a0ec 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -11,7 +11,6 @@ WWW=		https://llvm.org/
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "Makefile.LICENSE"
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE
index 799c47535c3c..29d0e13d0e0f 100644
--- a/devel/llvm-devel/Makefile.LICENSE
+++ b/devel/llvm-devel/Makefile.LICENSE
@@ -12,24 +12,20 @@
 # Google Test         BSD3CLAUSE
 # OpenBSD regex       REGEX
 # pyyaml tests        MIT
-# ARM contributions   ARM
 # md5 contributions   PD
 
-LICENSE=	ARM BSD3CLAUSE LLVM LLVM2 MIT PD REGEX
+LICENSE=	BSD3CLAUSE LLVM LLVM2 MIT PD REGEX
 LICENSE_COMB=	multi
 
 LICENSE_DIR?=		${WRKSRC}
-LICENSE_FILE_ARM=	${LICENSE_DIR}/lib/Target/ARM/LICENSE.TXT
 LICENSE_FILE_BSD3CLAUSE?=	${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT
 LICENSE_FILE_LLVM=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_FILE_MIT=	${LICENSE_DIR}/test/YAMLParser/LICENSE.txt
 LICENSE_FILE_REGEX=	${LICENSE_DIR}/lib/Support/COPYRIGHT.regex
-LICENSE_NAME_ARM=	ARM Limited license
 LICENSE_NAME_LLVM=	LLVM Release License
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_NAME_REGEX=	OpenBSD Regex License
-LICENSE_PERMS_ARM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_LLVM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_REGEX=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 68e984b10d12..6747ec29f8f8 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -13,7 +13,6 @@ COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
 
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 93cc6330d2fc..663b5c056669 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -14,7 +14,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index c34b2d1cb6cd..ebdead4701b9 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -14,7 +14,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index 5773be429a85..4a540ab2dc49 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -19,7 +19,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=	${LICENSE:NARM}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index 50ef4fde92b5..f43bd9c92cb5 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -19,7 +19,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index 68b2a5861aff..bbd9d65e61c3 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -20,7 +20,6 @@ WWW=		https://llvm.org/
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index de19df536f28..ceeb618400d2 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -20,7 +20,6 @@ WWW=		https://llvm.org/
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index 218805c73772..6fada4319531 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -14,7 +14,6 @@ WWW=		https://llvm.org/
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile
index 760588b65176..df3582ae5676 100644
--- a/devel/llvm19/Makefile
+++ b/devel/llvm19/Makefile
@@ -15,7 +15,6 @@ WWW=		https://llvm.org/
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-LICENSE:=	${LICENSE:NARM}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd