git: 18840affe5cd - main - devel/llvm*: Always define LLVM2 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:09 UTC
The branch main has been updated by brooks:

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

commit 18840affe5cd004d73517102a0a11b56ed087bab
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-03 01:53:51 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-03 23:56:56 +0000

    devel/llvm*: Always define LLVM2 license [NFC]
    
    All LLVM ports in the tree use the Apache License 2.0 with LLVM
    Exceptions license so cerntralize the definition.
    
    Sponsored by:   DARPA, AFRL
---
 devel/llvm-cheri/Makefile         |  4 ----
 devel/llvm-devel/Makefile         |  4 ----
 devel/llvm-devel/Makefile.LICENSE | 15 +++++++++++----
 devel/llvm11/Makefile             |  4 ----
 devel/llvm12/Makefile             |  4 ----
 devel/llvm13/Makefile             |  4 ----
 devel/llvm14/Makefile             |  4 ----
 devel/llvm15/Makefile             |  4 ----
 devel/llvm16/Makefile             |  4 ----
 devel/llvm17/Makefile             |  4 ----
 devel/llvm18/Makefile             |  4 ----
 devel/llvm19/Makefile             |  4 ----
 12 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 974eb8e93ce2..7002510f55b1 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -10,10 +10,6 @@ WWW?=		https://cheri-cpu.org
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE"
-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
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 6f881a9ad2dd..353f72a2a735 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -10,11 +10,7 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "Makefile.LICENSE"
-LICENSE+=	LLVM2
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE
index 9d88c4940fde..799c47535c3c 100644
--- a/devel/llvm-devel/Makefile.LICENSE
+++ b/devel/llvm-devel/Makefile.LICENSE
@@ -1,6 +1,10 @@
-# The "LLVM Release License" is largely a copy of the NCSA license, but
-# it contains extra verbiage about its interaction with third party
-# licenses so it is handled as a seperate license.
+# Signficant portions of the LLVM and the overall release are covered by
+# the Apache License 2.0 with LLVM Exceptions.  Due to the exceptions we
+# handle it as a separate license (LLVM2).
+#
+# The historic "LLVM Release License" is largely a copy of the NCSA license,
+# but # it contains extra verbiage about its interaction with third party
+# licenses so it is handled as a seperate license (LLVM).
 #
 # Third party software licenses in the LLVM tree include:
 # Program             License
@@ -11,18 +15,21 @@
 # ARM contributions   ARM
 # md5 contributions   PD
 
-LICENSE=	ARM BSD3CLAUSE LLVM MIT PD REGEX
+LICENSE=	ARM 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 76071eec226a..68e984b10d12 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -13,10 +13,6 @@ COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
 
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE+=	LLVM2
-LICENSE_FILE_LLVM2=	${WRKSRC}/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}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 2b9ed5eb4cc5..93cc6330d2fc 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -14,10 +14,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-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}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 00a6c0dd61e1..c34b2d1cb6cd 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -14,10 +14,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-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}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index b8e9bcf4471b..5773be429a85 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -19,10 +19,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-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}
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index f487da536760..50ef4fde92b5 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -19,10 +19,6 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index 3b4405abf143..68b2a5861aff 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -19,11 +19,7 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE+=	LLVM2
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index 818ac251a82a..de19df536f28 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -19,11 +19,7 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE+=	LLVM2
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index 2ff7b4aa3c01..218805c73772 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -13,11 +13,7 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE+=	LLVM2
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile
index f631cc1db49b..760588b65176 100644
--- a/devel/llvm19/Makefile
+++ b/devel/llvm19/Makefile
@@ -14,11 +14,7 @@ WWW=		https://llvm.org/
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
-LICENSE+=	LLVM2
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
-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}
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd