Date: Mon, 12 Dec 2022 15:48:57 +0100 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Andrew Turner <andrew@fubar.geek.nz> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 83bf6ab56829 - main - uname: switch machine to HW_MACHINE_ARCH Message-ID: <Y5c/WY7Ibl024uCj@KGPE-D16> In-Reply-To: <F89AA9DF-46F5-41A3-87DF-984B9F199E12@fubar.geek.nz> References: <202212111208.2BBC835O095410@gitrepo.freebsd.org> <F89AA9DF-46F5-41A3-87DF-984B9F199E12@fubar.geek.nz>
next in thread | previous in thread | raw e-mail | index | archive | help
--XN5yMNbl5yH0swQF Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 22-12-12 11:48:47, Andrew Turner wrote: > > >> On 11 Dec 2022, at 12:08, Piotr Kubaj <pkubaj@FreeBSD.org> wrote: >> >> The branch main has been updated by pkubaj (ports committer): >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D83bf6ab568293e325f437342c= db87a626353e27c >> >> commit 83bf6ab568293e325f437342cdb87a626353e27c >> Author: Piotr Kubaj <pkubaj@FreeBSD.org> >> AuthorDate: 2022-12-11 03:01:44 +0000 >> Commit: Piotr Kubaj <pkubaj@FreeBSD.org> >> CommitDate: 2022-12-11 12:05:39 +0000 >> >> uname: switch machine to HW_MACHINE_ARCH >> >> On powerpc64, powerpc64le and riscv64 some software wrongly assumes t= hat >> it runs on powerpc or riscv (32-bit). >> >> Differential revision: https://reviews.freebsd.org/D35962 >> Approved by: alfredo, imp >> --- >> 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 fba5eaeebc88..bd328d4f880f 100644 >> --- a/lib/libc/gen/__xuname.c >> +++ b/lib/libc/gen/__xuname.c >> @@ -127,11 +127,11 @@ __xuname(int namesize, void *namebuf) >> } >> q +=3D namesize; >> >> - if ((p =3D getenv("UNAME_m"))) >> + if ((p =3D getenv("UNAME_p"))) >> strlcpy(q, p, namesize); >> else { >> mib[0] =3D CTL_HW; >> - mib[1] =3D HW_MACHINE; >> + mib[1] =3D HW_MACHINE_ARCH; >> len =3D namesize; >> oerrno =3D errno; >> if (sysctl(mib, 2, q, &len, NULL, 0) =3D=3D -1) { >> > >This breaks the native arm64 build as make sets MACHINE based on this valu= e. It is changed from arm64 to aarch64 which is incorrect so I get issues l= ike the following: > >make[1]: =E2=80=9C.../freebsd/Makefile.inc1" line 163: Unknown target aarc= h64:aarch64. > >I expect it also breaks the powerpc and riscv native builds for the same r= eason. > >Can you please revert until this can be fixed. > >Andrew Reverted. Sorry for the breakage. I think will return with the next version of this patch and this time I'll make sure to run make universe on my powerpc64le instead of those pesky universe14 hosts :) --XN5yMNbl5yH0swQF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJkBAABCgBOFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmOXP1kwFIAAAAAAFQAS cGthLWFkZHJlc3NAZ251cGcub3JncGt1YmFqQGFub25nb3RoLnBsAAoJEHpZm4Ug g5ydv3oQAJ5ICvJMBiv3qjzvauoSCGDFYE21C26I4rtEb2seSWJSdndS73U9OAQp 5iNfivvi5VqX7jpXgxXNSqkEMZ2v6mIRfCtgOekra0s/A/fxsAPsnLaRttbyuJdC foov7xHKmuMCCUoIuymLbj54GS5RomM/UhvTK93L8Kl2FRdJgZV3CW3r4TnS5Nl9 XmQbvp6MqUUtwhwFTbDPKlkIKKLqvpLnsLElvRRYSwYXg83efxCXiwhHHFYz1MLX g0eYhegJ4tLxlJZK+mNFD3dFzJKEAd3J9SoDH/9oAIn53Utvyn4PPvcwD+x1HAPK /rGTNnQ46AY/pJAyYVYrJc7CmmKoLeahvpQIXyy3AuTAXxia9nES7nZ2TU6IjJ0c 8rVpln7d00vFsIEusVWrqyeCjuWXrq6/UbyCoS4sCteL0qSeOZIQnpjQv4b2asFn 3tdEljSIYz8DI17ISyfsjLGmiLHnA7XzNZFc1sFzHnV6Eaeg/tp+wfzBk+OihyPM /dlz5ociuAN6Evo35sSVrzrsP3+oOhr8gE+Xq3gwefAEVZBTunt91zshxEA0lYkB 8X35RyWVYjEMK8q7R1YoWfPOrMxWivIE46pWU13rNaAZg6q+vo9ZyA2HM6cdZS5L quJ5cjzFj/t7h7dbmHGylHZ43SMLGOBHENCOD/ebYlVPlBYDfeCN =B71n -----END PGP SIGNATURE----- --XN5yMNbl5yH0swQF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Y5c/WY7Ibl024uCj>