From nobody Fri Jan 03 23:57:09 2025 X-Original-To: dev-commits-ports-all@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 4YQ0qV0Hctz5kbnS; Fri, 03 Jan 2025 23:57:10 +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 4YQ0qT5qmtz4R9y; Fri, 3 Jan 2025 23:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948629; 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=QxnKPZGktsw4YtGdbqRDXyGYyM11A7qeSEVsEIhBH0w=; b=AxJDadfQK4iGy771MyhQeyJisU4085FtgRB9AMWkosUNu8AxMPKrZ2SNEDQGsye76MWvxQ 5VZRxn/ymnUiUBrGv5ZyaL/Nl15VaswUjdp3w4vCLjsUL8A/4B4xV2lEGQpbQwJAh0wtGX dA76PLY4s1y/fiHxsRXFtR1OV5aHy6ZAgKsGihvlegiM5rFzgbhRniHF5KzJelhXzP6UAW FT5uKK0k+r8OiaAs0FjrLtigMbuyI43fd4kFbb200MigSbjNNb+sTrodN4fxmx3CBaNrDw gClgEkQElD+rhLF/GfoCVfJoVg8Y6g8MN8ohN+exbtNiJgu/n+W2aCN6nHYsZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948629; 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=QxnKPZGktsw4YtGdbqRDXyGYyM11A7qeSEVsEIhBH0w=; b=Xu67XZ5x7ikBlgtjMRjnBVsH+3TuqeYWYV1dS2FABYxrKkSwJFPIyvVSg7TfsoDTG83Gqh hYupbQfyQUIBVQRqjIY/PrTMBuY/k0I6XYNCzG+KuqjAXUC1tfp5MTs3YBfNO9czs4kMFj cmDH5FCnWUpa5094SP3NmTpTvHmCnV752FLSU0iMhUoPwOpuh8N+kfGFVxAOdyL1aC9C7e PbK1AMC43nUOmgv/qlKjfMUgOVJ3rLLP38H84BLMPyz/QsPGYUQi3F/Qb0u0Zx9F7TMhl1 Hf/yfbFw8abZHMZFli/Ss0xVIzJjLPIov56q8u2Rcavh2otOvFVuziu70feQLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735948629; a=rsa-sha256; cv=none; b=Y8bl89S5FxlDfIcPFwiWvxbJ3bfD9OscBFCcSjhTi3XjPM73CUgxLKsL4+n1uShE/n15EX Dh71lfBR1HNN+MOrqjjQ8dIlJek93tcJKb7ELL3mdQQEoSuufdvPFQgEOk28riK/Tb3VUK SN9e/uyJb+NRiA8xQl4EVaHnd1F+lWTUv/8KIVm+o5QZzCM2RS1Vzk7amts09Ex7aFaqFh ALd2b09rkQDePKDdEOa85EaFlQTTLvbJrgs+A99nCCdErS9T9zdH2dXFJFpRvxzOBw5/kG yeUHccZHKY3hR1gThN58raJ9ZZ9bLD/R1VRXzrbnS+3HtCdbowh0iLl2HD+jTw== 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 4YQ0qT5L1TzCmL; Fri, 03 Jan 2025 23:57:09 +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 503Nv9Wi076563; Fri, 3 Jan 2025 23:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503Nv9L9076560; Fri, 3 Jan 2025 23:57:09 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:57:09 GMT Message-Id: <202501032357.503Nv9L9076560@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: 18840affe5cd - main - devel/llvm*: Always define LLVM2 license [NFC] List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 18840affe5cd004d73517102a0a11b56ed087bab Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=18840affe5cd004d73517102a0a11b56ed087bab commit 18840affe5cd004d73517102a0a11b56ed087bab Author: Brooks Davis AuthorDate: 2025-01-03 01:53:51 +0000 Commit: Brooks Davis 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