Date: Fri, 3 Jan 2025 23:57:11 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4f177eced75e - main - devel/llvm*: LICENSE_DIR simplification Message-ID: <202501032357.503NvBvU076644@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f177eced75e0e3fb1c5a9f782b6810e253265f9 commit 4f177eced75e0e3fb1c5a9f782b6810e253265f9 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2025-01-03 01:41:07 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2025-01-03 23:56:56 +0000 devel/llvm*: LICENSE_DIR simplification WRKSRC moved to the top of the source tree with llvm12. As a result, LICENSE_DIR became ${WRKSRC}/llvm. Given that llvm11 the only port that wasn't setting LICENSE_DIR, flip the script and default to ${WRKSRC}/llvm with llvm11 overriding. Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 1 - 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 - 12 files changed, 2 insertions(+), 11 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index f136859697a3..d75b52ff7bbb 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -8,7 +8,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT?= LLVM and Clang with support for the CHERI architecture WWW?= https://cheri-cpu.org -LICENSE_DIR= ${WRKSRC}/llvm .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE" NOT_FOR_ARCHS= i386 armv6 armv7 powerpc mips diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index e9b8c4c9a0ec..7b6c2f5729c4 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -8,7 +8,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE index 29d0e13d0e0f..1e4b968751ed 100644 --- a/devel/llvm-devel/Makefile.LICENSE +++ b/devel/llvm-devel/Makefile.LICENSE @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE LLVM LLVM2 MIT PD REGEX LICENSE_COMB= multi -LICENSE_DIR?= ${WRKSRC} +LICENSE_DIR?= ${WRKSRC}/llvm LICENSE_FILE_BSD3CLAUSE?= ${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT LICENSE_FILE_LLVM= ${LICENSE_DIR}/LICENSE.TXT LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 6747ec29f8f8..475724ea10da 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -12,6 +12,7 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ +LICENSE_DIR= ${WRKSRC} .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 663b5c056669..6c29b93ff15d 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index ebdead4701b9..75487e8350f6 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 4a540ab2dc49..e3c5c49365e5 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LLVM_RELEASE= ${DISTVERSION:C/rc.*//} diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index f43bd9c92cb5..298595c26034 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LIB_DEPENDS= libzstd.so:archivers/zstd diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index bbd9d65e61c3..2fef08038e6a 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index ceeb618400d2..c900e9790609 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -17,7 +17,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index 6fada4319531..8b59e35b86af 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -11,7 +11,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile index df3582ae5676..58935a654dbe 100644 --- a/devel/llvm19/Makefile +++ b/devel/llvm19/Makefile @@ -12,7 +12,6 @@ MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang WWW= https://llvm.org/ -LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501032357.503NvBvU076644>