Date: Wed, 24 Jan 2024 20:43:51 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: 0d92ee1e3b15 - main - devel/llvm-{cheri,cheriot,morello}: assorted fixups
Message-ID: <202401242043.40OKhpn7007386@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=0d92ee1e3b15933d03d9b930d3a79dd176d2891c commit 0d92ee1e3b15933d03d9b930d3a79dd176d2891c Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2024-01-24 20:35:31 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2024-01-24 20:43:41 +0000 devel/llvm-{cheri,cheriot,morello}: assorted fixups Allow override of GH_PROJECT and GH_ACCOUNT[0] and fix GH_PROJECT in llvm-cheriot. No change in the source, but the filename is now corrected. Centralize include of Makefile.snapshot. Reported by: Irina Dudina <irina.dudina@ed.ac.uk> --- devel/llvm-cheri/Makefile | 10 ++++------ devel/llvm-cheriot/Makefile | 6 +++--- devel/llvm-cheriot/distinfo | 6 +++--- devel/llvm-morello/Makefile | 2 -- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 92cc81b45ad6..778946d17284 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -60,14 +60,12 @@ CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS}" .ifndef USE_GITLAB USE_GITHUB= yes -GH_PROJECT= llvm-project -GH_ACCOUNT= CTSRD-CHERI +GH_PROJECT?= llvm-project +GH_ACCOUNT?= CTSRD-CHERI GH_TAGNAME= ${LLVM_COMMIT} .endif -.ifndef SNAPDATE -.sinclude "${.PARSEDIR}/Makefile.snapshot" -.endif +.include "${.CURDIR}/Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS LIT LLD STATIC_LIBS XTOOLCHAIN OPTIONS_DEFAULT= CLANG LIT LLD XTOOLCHAIN diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile index 9bcbbf066e25..0c0cb1cfa5ee 100644 --- a/devel/llvm-cheriot/Makefile +++ b/devel/llvm-cheriot/Makefile @@ -9,13 +9,13 @@ DISTINFO_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -OPTIONS_EXCLUDE= XTOOLCHAIN +GH_ACCOUNT= CHERIoT-Platform + +OPTIONS_EXCLUDE= XTOOLCHAIN STATIC_LIBS LLVM_TARGETS= RISCV CMAKE_FLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=riscv32-unknown-unknown -.include "${.CURDIR}/Makefile.snapshot" - MASTERDIR= ${.CURDIR}/../llvm-cheri .include "${MASTERDIR}/Makefile" diff --git a/devel/llvm-cheriot/distinfo b/devel/llvm-cheriot/distinfo index 3cd242b246e7..3a7b0ff04a51 100644 --- a/devel/llvm-cheriot/distinfo +++ b/devel/llvm-cheriot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706037618 -SHA256 (CTSRD-CHERI-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 10480d5f5f8b483e9b8db46f6fa5ea75ca296ddb0568d631c275a63abcd4d1f3 -SIZE (CTSRD-CHERI-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 152273349 +TIMESTAMP = 1706115295 +SHA256 (CHERIoT-Platform-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 10480d5f5f8b483e9b8db46f6fa5ea75ca296ddb0568d631c275a63abcd4d1f3 +SIZE (CHERIoT-Platform-llvm-project-13.0.d20240112-6544c9b0f68d263e449ed217f34fa25ee3b7d0ed_GH0.tar.gz) = 152273349 diff --git a/devel/llvm-morello/Makefile b/devel/llvm-morello/Makefile index b30c9bc0ed65..d53ad5daf432 100644 --- a/devel/llvm-morello/Makefile +++ b/devel/llvm-morello/Makefile @@ -18,8 +18,6 @@ GL_TAGNAME= ${LLVM_COMMIT} # Regularly tested targets as part of Android development LLVM_TARGETS= AArch64;ARM;BPF;X86 -.include "${.CURDIR}/Makefile.snapshot" - MASTERDIR= ${.CURDIR}/../llvm-cheri .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401242043.40OKhpn7007386>