From nobody Sat Oct 15 15:59:44 2022 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 4MqScw6TYPz4f7xg; Sat, 15 Oct 2022 15:59:44 +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 4MqScw5Zn8z3qQr; Sat, 15 Oct 2022 15:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665849584; 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=8f/0qOnRUFEPL3PJw0dJsCh0YVLAMdKJcn9dqtZAQEA=; b=jo9VmwMtHqmMvVFyGUamdZW+BLZayAgHAwqdVz8xRwf1yB4y6ubHv0ElVTv197Po8oTzFr Ooy5Q7il+whRbxDbSEDK3rijAfs2skf90rOcbqK/kzbPUBWyh5b5zBdnKTAA7RCwIEJtdu 6vgWKSo4BSvB/uZo5HjQvfQZdR7vYsMAAfnHw9LGOruT0j4e/EDQAQOL+227vpE+HoFyVV x3k/o8CcPwvFYZjNdJO+7bj5Q94xzgEqFWYqMDKRiBLvPezF719FNLOBK6Q1/3FOcdxKmO sc3s6CJ/azlJ+SpEbWNI9FtWj7JJuT+b7SB5kl87c82hWKluc2EmyEuaU3staQ== 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 4MqScw4PzGz19KY; Sat, 15 Oct 2022 15:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29FFxiCs028945; Sat, 15 Oct 2022 15:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FFxiF5028944; Sat, 15 Oct 2022 15:59:44 GMT (envelope-from git) Date: Sat, 15 Oct 2022 15:59:44 GMT Message-Id: <202210151559.29FFxiF5028944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 56f224add65d - main - benchmarks/uica: fix build on riscv and in UTC-... time zones 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56f224add65df796bf57c49ea782e00470a56885 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665849584; 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=8f/0qOnRUFEPL3PJw0dJsCh0YVLAMdKJcn9dqtZAQEA=; b=dj2NggEGG4NwbqH11HywZG4mwXOk7BKyrNjnYlgybcycGv2CANxNE2RsMjxSKZVNgmEYAI MbPUMvJocpuRNv002GOEV8swnBwXoeMkPgDQsP083Tjn6CnhYzafmD2zE3Z9kkLh9W6M3N WBUcjJMMMbyAKuHe4RXUZaTqvyDyvDqNv14g8y4q33B0b6aCY2wDRLfR8ZNcB4cDJgjPIv 3qL10R1l8LDwd6YIbwOYFFDLwkg8of8413AWPIVpYYy/FRRkIoGt1IsgPhSZzq2aMbdL87 tkF5Nd//U7CBiXzOIXbZHe0kd85CNvyG3nfKZcFDLzHL4RLehT5VCAt8aOfiZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665849584; a=rsa-sha256; cv=none; b=duMnr/GxUQJ7bLvECh0aQfa+xZk3JHLITgGyiIQOhjuNZd40/pU59M262SlBwVBsGztk/j zerFL632RwU+zj5yll1CTE7biiJj9JTa0NYKAbAJ5mi5ZZ162iBJl6MZpUzJ+VtlouoNqQ m9VW/vQqP41MBHvhNZfhkauaeSi8HxQvBbIN5fblhWbKwLqAM+/z7FI0o8MSnG3ntrziQA yoUy7jQaA1anVtT18mj2gHiCK2zWRfZm75EegQc0atNbuoeC2tMRkOMy8LM75vVaBEC+BZ 8RZ/DbdTSRWd0ooWc8RrkgNez+t3aYqEvYXJ6/OCadOTr9CC2B8xGw+H4HKrrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=56f224add65df796bf57c49ea782e00470a56885 commit 56f224add65df796bf57c49ea782e00470a56885 Author: Robert Clausecker AuthorDate: 2022-09-11 13:02:49 +0000 Commit: Dima Panov CommitDate: 2022-10-15 15:59:34 +0000 benchmarks/uica: fix build on riscv and in UTC-... time zones - inform mbuild CPU type detection script about the existence of this newfangled architecture. - pass TZ=UTC to date(1) while generating distfile name to avoid off by one error on the first day of the month in time zones west of Greenwich. PR: 267020 Submitted by: maintainer MFH: 2022Q4 --- benchmarks/uica/Makefile | 2 +- benchmarks/uica/files/patch-mbuild_mbuild_env.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/benchmarks/uica/Makefile b/benchmarks/uica/Makefile index a1afe07e609f..8a4dab59986d 100644 --- a/benchmarks/uica/Makefile +++ b/benchmarks/uica/Makefile @@ -29,7 +29,7 @@ SHEBANG_FILES= uiCA.py # manually build a file name like instructions_Apr2022.xml from # the machine-sortable INSTRVERSION. Use := to have date run only once INSTRVERSION= 2022.04 -INSTRUCTIONS:= instructions_${LC_ALL=C date -j -f %Y.%m ${INSTRVERSION} +%b%Y:L:sh}.xml +INSTRUCTIONS:= instructions_${${SETENV} LC_ALL=C TZ=UTC date -j -f %Y.%m ${INSTRVERSION} +%b%Y:L:sh}.xml MFLAGS= --compiler=${COMPILER_TYPE:S/gcc/gnu/} \ --cc=${CC} \ diff --git a/benchmarks/uica/files/patch-mbuild_mbuild_env.py b/benchmarks/uica/files/patch-mbuild_mbuild_env.py index 45cb5d02ebe1..2e48ab4c77ed 100644 --- a/benchmarks/uica/files/patch-mbuild_mbuild_env.py +++ b/benchmarks/uica/files/patch-mbuild_mbuild_env.py @@ -1,11 +1,13 @@ --- mbuild/mbuild/env.py.orig 2021-04-16 20:40:24 UTC +++ mbuild/mbuild/env.py -@@ -1237,6 +1237,8 @@ class env_t(object): +@@ -1237,6 +1237,10 @@ class env_t(object): return 'ia32' elif name in ['aarch64', 'arm64']: return 'aarch64' + elif name[0:3] == 'arm': + return 'arm' ++ elif name[0:5] == 'riscv': ++ return 'riscv' else: die("Unknown cpu " + name)