The following commit has been merged in the master branch:
commit cbc16cec1a13ff9e8bd4067622c91b38009d4628
Author: Andrew Deason <adea...@sinenomine.net>
Date: Tue Oct 25 13:24:58 2022 -0500
FBSD: Handle amd64 in host triplet
In ostype.m4 and sysname.m4, we detect amd64 FreeBSD by matching $host
against "x86_64-*-freebsd*". On FreeBSD, `uname -p` on these systems
prints "amd64", but the config.guess from the GNU config project (that
is, <https://savannah.gnu.org/projects/config/>) translates amd64 into
x86_64 for FreeBSD, and has for a very long time.
For whatever (historical) reasons, anything built from FreeBSD ports
uses a version of the config.guess script that has FreeBSD-specific
modifications (which lives in /usr/ports/Templates/config.guess). This
version does not translate amd64 into x86_64, and so our $host looks
like, for example:
$ sh /usr/ports/Templates/config.guess
amd64-unknown-freebsd12.3
If regen.sh is run on a FreeBSD host, we pull our config.guess from
libtool, which normally is built from FreeBSD ports, and so results in
a host triplet with "amd64" for amd64 hosts. And so the build breaks
early on, because we don't recognize that we're on FreeBSD.
To accommodate this, match our amd64 FreeBSD host triplets against
amd64 or x86_64, so we can build using a config.guess from FreeBSD or
GNU upstream.
Change-Id: I372c9c9150b6639fa0cda96052cf50eb2857a3bb
Reviewed-on: https://gerrit.openafs.org/15159
Reviewed-by: Cheyenne Wills <cwi...@sinenomine.net>
Reviewed-by: Måns Nilsson <mansa...@besserwisser.org>
Reviewed-by: Michael Meffie <mmef...@sinenomine.net>
Reviewed-by: Andrew Deason <adea...@sinenomine.net>
Tested-by: Andrew Deason <adea...@sinenomine.net>
src/cf/ostype.m4 | 2 +-
src/cf/sysname.m4 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
OpenAFS Master Repository
_______________________________________________
OpenAFS-cvs mailing list
OpenAFS-cvs@openafs.org
https://lists.openafs.org/mailman/listinfo/openafs-cvs
