From nobody Fri Jan 03 23:57: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 4YQ0qY3g6Bz5kbsX; Fri, 03 Jan 2025 23:57: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 4YQ0qY1xtCz4RXR; Fri, 3 Jan 2025 23:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948633; 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=A+Nm9cuCqRsgXNqj+ptj/fRrgK9eUkhP5jle7BdPeeQ=; b=iV4J7iivZemyqEGzuXv7rKF9/1xC3vPCUzCZ6T98DilPyeaYhYu9CcrXYsaKFdCW5icYTy Ieuqde4KSrutCWFCGiKmhV6hXc1cVaZ633pCWSI9BrSMaJueRALWVGSsP8dCxSxAyDYoeJ ZMsnGRbb7oZfO/sDeuXzS2XStITecunxS/SpMmXdquQhMdZA8yDzgP0N52sppZOOk2tN0h II8wgqd1LtMqMOSbE4ZUWAdnEIJDJFvH1E0UovzLyaKYL/d2FA2mLKlPX8ivJjaR2k8lwr DYzV8sXsNTRrWnq2aFUnwCO3qsnz8w55mI3QNEz+e8INWcQDpK+Od47JRJNKpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735948633; 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=A+Nm9cuCqRsgXNqj+ptj/fRrgK9eUkhP5jle7BdPeeQ=; b=hVCIsWDa5tM7bYPA1oFlQ04Xr/3dz4Mypgg2rKXyVBnane7n9zKhW8lrYOxPY69UYNoemp HicjZNODyrc4751nTPvIWZODHlrpuXMpCAZlthxjuMU73H302cyvplBhUEUcvR4O8ejKbw RxOuTvhkN51OcDms+lz8LBCiGMlikhih++qhRbq0GKdy1cHchTVSer8qyEsBMs3uVGgfVW azrqf6RXLNFSuaWM0Q/OF3pgXcSFYIAqQKDHcAKzTOcztq22pvSf9Qn0igr1rJM6T+bTt7 ETpYlSUUxb27K1L7nV1L3SBiauqhHe+IcgY/OqLLwMxtwmxH+CFu5ITpvFmyPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735948633; a=rsa-sha256; cv=none; b=PQ7cRr0MBxFSbRvCejDB+A7Okxsws960uP1ifEKDeRxtwrl9yqcDiZ6XPJFcbuqLRUFYDE +Frccude7FKQ96bcMfkeP7iJEtrMS+NVpfXFofcb9OZlRj1hr11IDUr3JUtZHOuNHIGBmq GQjVUsX1u9j4kgC8F7cJn/7CLrUyU+Xg6DIjyMLZtuPetLY+fnsruKwwF5gRSkVtf1TDAh 7wyFoWBeP0Xs8CUc8I01oDDkAA0mwByJSqGt+vFerIqEnjXAiHS/IVaV0p7DIWGBFqvCRO H2Sopeo0zwTv0m8FQFtEbjkdM+MaIzXyno/D+rb9XY6ztkmfGpMrj9AlMKneNw== 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 4YQ0qY1LVTzCFX; Fri, 03 Jan 2025 23:57: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 503NvDVw076694; Fri, 3 Jan 2025 23:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 503NvDNT076691; Fri, 3 Jan 2025 23:57:13 GMT (envelope-from git) Date: Fri, 3 Jan 2025 23:57:13 GMT Message-Id: <202501032357.503NvDNT076691@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: 57f97b36a7cf - main - devel/llvm*: flip LICENSE_FILE_BSD3CLAUSE setting [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: 57f97b36a7cfe19702fbf967e31e0403b72a7ea3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=57f97b36a7cfe19702fbf967e31e0403b72a7ea3 commit 57f97b36a7cfe19702fbf967e31e0403b72a7ea3 Author: Brooks Davis AuthorDate: 2025-01-03 01:46:13 +0000 Commit: Brooks Davis CommitDate: 2025-01-03 23:56:57 +0000 devel/llvm*: flip LICENSE_FILE_BSD3CLAUSE setting [NFC] The location of this license file moved in LLVM 16. Since I'm doing cleanup in this area and the split of ports is about 50/50, switch to setting the old location in the older ports so the newer ports set fewer variables. Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 4 ++++ devel/llvm-cheriot/Makefile | 3 --- devel/llvm-devel/Makefile | 1 - devel/llvm-devel/Makefile.LICENSE | 2 +- 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 - 13 files changed, 10 insertions(+), 9 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index d75b52ff7bbb..107e156aeb35 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -8,6 +8,10 @@ MAINTAINER= brooks@FreeBSD.org COMMENT?= LLVM and Clang with support for the CHERI architecture WWW?= https://cheri-cpu.org +.if !defined(LLVM_SUFFIX} || ${LLVM_SUFFIX} == "-morello" +# XXX: really (LLVM_MAJOR < 16), but it's not defined here +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT +.endif .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE" NOT_FOR_ARCHS= i386 armv6 armv7 powerpc mips diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile index f23c9d8c7731..0c0cb1cfa5ee 100644 --- a/devel/llvm-cheriot/Makefile +++ b/devel/llvm-cheriot/Makefile @@ -5,9 +5,6 @@ LLVM_SUFFIX= -cheriot COMMENT= LLVM and Clang with support the CHERIoT microcontroller WWW= https://www.microsoft.com/en-us/research/publication/cheriot-rethinking-security-for-low-cost-embedded-systems/ -# Moved in LLVM 16 -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT - DISTINFO_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 7b6c2f5729c4..de540ac5a7f2 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -9,7 +9,6 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ .include "Makefile.LICENSE" -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE index 1e4b968751ed..dd682c2145a8 100644 --- a/devel/llvm-devel/Makefile.LICENSE +++ b/devel/llvm-devel/Makefile.LICENSE @@ -18,7 +18,7 @@ LICENSE= BSD3CLAUSE LLVM LLVM2 MIT PD REGEX LICENSE_COMB= multi LICENSE_DIR?= ${WRKSRC}/llvm -LICENSE_FILE_BSD3CLAUSE?= ${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT +LICENSE_FILE_BSD3CLAUSE?= ${WRKSRC}/third-party/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 diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 475724ea10da..776ca462744e 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -13,6 +13,7 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ LICENSE_DIR= ${WRKSRC} +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 6c29b93ff15d..99f1ce281056 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -12,6 +12,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 75487e8350f6..2404d7dd0ab1 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -12,6 +12,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index e3c5c49365e5..08506ad96fab 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -17,6 +17,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 298595c26034..8435a3934c4d 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -17,6 +17,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 2fef08038e6a..101dba7d6f40 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -18,7 +18,6 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index c900e9790609..8cca940a285d 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -18,7 +18,6 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index 8b59e35b86af..e4ed2b40d54e 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -12,7 +12,6 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile index 58935a654dbe..b0747b9cb6f4 100644 --- a/devel/llvm19/Makefile +++ b/devel/llvm19/Makefile @@ -13,7 +13,6 @@ COMMENT= LLVM and Clang WWW= https://llvm.org/ .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" -LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LIB_DEPENDS= libzstd.so:archivers/zstd