The branch main has been updated by pkubaj (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=85dd853236149dd029d5c065efce0e802f9c1e9a
commit 85dd853236149dd029d5c065efce0e802f9c1e9a
Author: Piotr Kubaj <pku...@freebsd.org>
AuthorDate: 2022-12-12 14:39:12 +0000
Commit: Piotr Kubaj <pku...@freebsd.org>
CommitDate: 2022-12-12 14:42:05 +0000
Revert "uname: switch machine to HW_MACHINE_ARCH"
Reverting because of issue in Makefile.inc1 during native builds:
make[1]: “.../freebsd/Makefile.inc1" line 163: Unknown target
aarch64:aarch64.
Since I only tested this patch with make universe on amd64, this issue
wasn't caught.
This reverts commit 83bf6ab568293e325f437342cdb87a626353e27c.
---
lib/libc/gen/__xuname.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index bd328d4f880f..fba5eaeebc88 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -127,11 +127,11 @@ __xuname(int namesize, void *namebuf)
}
q += namesize;
- if ((p = getenv("UNAME_p")))
+ if ((p = getenv("UNAME_m")))
strlcpy(q, p, namesize);
else {
mib[0] = CTL_HW;
- mib[1] = HW_MACHINE_ARCH;
+ mib[1] = HW_MACHINE;
len = namesize;
oerrno = errno;
if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
