1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-01 10:59:55 +00:00

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>
This commit is contained in:
Brooks Davis 2024-01-24 20:35:31 +00:00
parent 7c6de6cb96
commit 0d92ee1e3b
4 changed files with 10 additions and 14 deletions

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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"