git: 56f224add65d - main - benchmarks/uica: fix build on riscv and in UTC-... time zones
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Oct 2022 15:59:44 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=56f224add65df796bf57c49ea782e00470a56885
commit 56f224add65df796bf57c49ea782e00470a56885
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-09-11 13:02:49 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
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)