From nobody Sat Oct 15 16:00:44 2022 X-Original-To: dev-commits-ports-branches@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 4MqSf5143Zz4f8MZ; Sat, 15 Oct 2022 16:00:45 +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 4MqSf50cthz3qWV; Sat, 15 Oct 2022 16:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665849645; 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=AEb5YNrkPLWy6ZbdDmX5CvcJNls9qA25FkwF35m4Htw=; b=Wp5NQtDIh3slRW0OvkCcjHAlLTBDm4WwKrNEZ18cwXvYOGPxa/Fqffh5UYEyvI6qX5Y0a6 HJzm/V8G2abDOvt+xd6M9qvwLy+/U8Vcb6EBlWW1PLORtWqUpBz5PX2zjc/N+0eVV8z+Y6 LuUftOqmZWv+egCAiGw6IHdabciS0cQj0eVO7C6hPxbcM25PQstbdSdzpSHSDbJCQEFPG/ xL8JlH2jDRWbXih6nnx8tpjw1ZSI9pRgckP3dzL11ckpJBYWvpinuVq8gZGCtvk8RtDYLq QRbMxljVxIyCrL0Mbl/pmnsi0oG2q6ZBOJc7pfg3YwkOdJJJCyJ9gh+Dxo8uQQ== 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 4MqSf46TfXz19C4; Sat, 15 Oct 2022 16:00: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 29FG0iH6039688; Sat, 15 Oct 2022 16:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FG0ii1039687; Sat, 15 Oct 2022 16:00:44 GMT (envelope-from git) Date: Sat, 15 Oct 2022 16:00:44 GMT Message-Id: <202210151600.29FG0ii1039687@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 7be261e9dcc7 - 2022Q4 - benchmarks/uica: fix build on riscv and in UTC-... time zones List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 7be261e9dcc7b2d3f7f39dc19a40c19c40e73618 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665849645; 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=AEb5YNrkPLWy6ZbdDmX5CvcJNls9qA25FkwF35m4Htw=; b=sm/aPBJ0oF3bPTr0bG56Bj+k3kBVda8dDdZVnhWW4mDfPoVXoOHUT6NoKcKJ+NWgXORjBn EVQhrE00ssPIYiQ+ob01hG0XElVIpgAYml3HPsk/PDOiVFo1ZlrNLK7ebeoLD0stA9+h4R Z499mwkAUP0VK8rZlDXLPHSk73YHeOHVO3RA106opssZbM5C2Sqc1Q7jBEMqt+Ip8mZYGv mEGJotFkikSblwTd2Dzl/oXmo8q9WIP8+KXSD17vbFQr4rpmDkFDXv0QbNEnBKz2KQScDb mYZk2gxVDB29yatLxJKe9FYWCHSYjWI4UgL1f1gm6P2+7hihu6wTvXVx9F7P2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665849645; a=rsa-sha256; cv=none; b=Ak+8f0NxrjBoAuSI0iIseqfW3GD6z6k3HTVV4UOKe1S3c1Y1GZBEQd1MVtw44x7wkVYEea gCTkuAEk6QmkeASnBpzVOwwkVP/431aPNpxh0I29QPbDwOKsS8tW3V+Ns/5XXDPAb7SNaA Y9NVtUTBEBZNyot3u9qDZcLZD+j2g5nWQPH6Hhqmi9zKE/+N8rlM1ZiMOl2BFOm24WAIQ7 rIlaN/nXfcdn9gMlkYLgHglU6e496FcnXhWe/yeSfkgzEqyt2TB76KSPTC78MjcIOkp0Z6 o0m4CfS/YGRcnEqJ0KkXY7+BX3+0X070Alzd+7Yd+iLwxKyIQBTsYFcbMHawgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7be261e9dcc7b2d3f7f39dc19a40c19c40e73618 commit 7be261e9dcc7b2d3f7f39dc19a40c19c40e73618 Author: Robert Clausecker AuthorDate: 2022-09-11 13:02:49 +0000 Commit: Dima Panov CommitDate: 2022-10-15 16:00: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 (cherry picked from commit 56f224add65df796bf57c49ea782e00470a56885) --- 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)