From nobody Wed Jan 24 20:43:51 2024 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 4TKwsg6R1bz58hFT; Wed, 24 Jan 2024 20:43:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKwsg5v0mz4Q90; Wed, 24 Jan 2024 20:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706129031; 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=0XkXqLXUMkNhhk0Bc39f4gsnJxBErrNJouWsFtS5C50=; b=PHPUfvBWMgsnTjgLh4HA7YI6mJHZEgd53nElpQQpjYoVGxKW6PU7qtmw5kmT6EF0gEZYLl R52WZIJ4sxzVWn+4mkn9JQ9sRDYADufx8NdtjVOfMo1h2v7mcXuMs8v7lMeYbC9AGzTR5n xT4FZjOETZuGdhpgMcvFi+tfcX/irD523v1TasvC6x8wNlRGo/LkR+E4w4BcxwprsWt+zT DTrH6MH6Yb3hSJgaDgpoJHIGsypjTH2HwSMh9eGIUP47mNpUPgDVhw1mpi7WQ3sEyUb4q5 mtXzV9UTrUIB2ILDlGkpLmL0DmOT3NXDMj8TWacnxGcGFlBLRB0fqmTjT6f30A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706129031; 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=0XkXqLXUMkNhhk0Bc39f4gsnJxBErrNJouWsFtS5C50=; b=T0eKYELio6REgEVkdbi+AQ4BomrMsozUhLMtQI4yb0LF3Rl4AB8Mrb6IIGHq8L4rHnDKO5 8svb8JEIW7BnnHUy5PnBDxwmCLLerM/UqxM/LMmvP79zZTWChHG1OQ8lL/lugeqOZ8ir5X Mn27GWkt04CemFKKjXz33LMK5lhTpKSZ9h1W42XfItGyAXj1byGaRfJ6kSJvbzbPQzPdHF fJFR8QicccFLpLEW/Pa5tbTqdrntHD3fGkRURkqXB4n1DHzxT7i5H2OkKZPlHp/ZVEKMqK ieqWbU/ztGe4/gpAJAFW8aLq7B05bMeOfxGGeANuRibBpoTBhOprykMt3tuUVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706129031; a=rsa-sha256; cv=none; b=qvWM4n6ABfUbF2KCG5PgopDGXsiDX+130xmHDiGiHl0gFUDKSR3739dT0tULfXTlGOD8Pu b0RG2AIP9OBpFWYF8/BCfHvDdQvwwU9d+mL/C8O+qJzJQ7gn6a+4p6iuoMw+14aBUCpcbn TPAmomaf32UE4PS4qKA4KkkP35MH3Iv9IDBqhMoZYnZKHKJjSRs7F97+XzNGlWhP5e5ULF D8C7QYooFcCpyyCaBoGntkfZhhYc7XnIYsyE1uXXLXZuDOF00nWJwjPVSVhClfi+OggyDt OnnF+uJx9oSOvTSEw2DNBTVsQ3WltI/7EwTSWxjw8DTKQBuOoZ2/VI+atmF/og== 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 4TKwsg4ys6zSwL; Wed, 24 Jan 2024 20:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40OKhp0v007389; Wed, 24 Jan 2024 20:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OKhpn7007386; Wed, 24 Jan 2024 20:43:51 GMT (envelope-from git) Date: Wed, 24 Jan 2024 20:43:51 GMT Message-Id: <202401242043.40OKhpn7007386@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: 0d92ee1e3b15 - main - devel/llvm-{cheri,cheriot,morello}: assorted fixups 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 0d92ee1e3b15933d03d9b930d3a79dd176d2891c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d92ee1e3b15933d03d9b930d3a79dd176d2891c commit 0d92ee1e3b15933d03d9b930d3a79dd176d2891c Author: Brooks Davis AuthorDate: 2024-01-24 20:35:31 +0000 Commit: Brooks Davis 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 --- 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"