Date: Wed, 17 Feb 2021 10:00:14 +0100 From: Dimitry Andric <dimitry@andric.com> To: Mark Millard <marklmi@yahoo.com> Cc: Brandon Bergren <bdragon@FreeBSD.org>, FreeBSD Current <freebsd-current@freebsd.org>, Glen Barber <gjb@freebsd.org> Subject: Re: pkg vs uname troubles after upgrade to 14 (lld not rebuilt issue? (X_)LINKER_FREEBSD_VERSION still 13 based?) Message-ID: <11EDC667-3CDE-4E1E-A73C-9350C18C9E37@andric.com> In-Reply-To: <1C834C8B-4875-408E-8834-B60D154EBB16@yahoo.com> References: <5B780540-0C4A-4438-A550-E88A36EA50F3.ref@yahoo.com> <5B780540-0C4A-4438-A550-E88A36EA50F3@yahoo.com> <5ef34e30-6c65-417a-810e-257fc0864a84@www.fastmail.com> <224EA9F1-AF1B-4F85-9D0F-3BA990F30814@yahoo.com> <1C834C8B-4875-408E-8834-B60D154EBB16@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 17 Feb 2021, at 04:28, Mark Millard via freebsd-current <freebsd-current@freebsd.org> wrote: > > On 2021-Feb-16, at 15:37, Mark Millard <marklmi at yahoo.com> wrote: >> On 2021-Feb-16, at 11:49, Brandon Bergren <bdragon at FreeBSD.org> wrote: >>> It looks like there were recently some fixes to release.sh, that just got backported to 13. I wonder if the problem is the packages themselves being misbuilt. >>> >>> https://cgit.freebsd.org/src/commit/release?h=releng/13.0&id=4689ab1eab624d1a551a5a8f109383ea18eeba20 ... > Builds that do nor force being from scratch tend to: > > make[1]: "/usr/fbsd/mm-src/Makefile.inc1" line 339: SYSTEM_COMPILER: Determined that CC=cc matches the source tree. Not bootstrapping a cross-compiler. > make[1]: "/usr/fbsd/mm-src/Makefile.inc1" line 344: SYSTEM_LINKER: Determined that LD=ld matches the source tree. Not bootstrapping a cross-linker. > > But in my build environment, after upgrading to 14 and > doing multiple updates as 14 has progressed, I find: > > # ld -v > LLD 11.0.1 (FreeBSD llvmorg-11.0.1-0-g43ff75f2c3fe-1300007) (compatible with GNU linkers) > > Note the "1300007". This goes along with: Ah, it looks like that wasn't bumped (though strictly, it isn't necessary, it's more for form) in lib/clang/include/VCSVersion.inc: % cat lib/clang/include/VCSVersion.inc // $FreeBSD$ #define LLVM_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe" #define LLVM_REPOSITORY "git@github.com:llvm/llvm-project.git" #define CLANG_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe" #define CLANG_REPOSITORY "git@github.com:llvm/llvm-project.git" // <Upstream revision at import>-<Local identifier in __FreeBSD_version style> #define LLD_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe-1300007" #define LLD_REPOSITORY "FreeBSD" #define LLDB_REVISION "llvmorg-11.0.1-0-g43ff75f2c3fe" #define LLDB_REPOSITORY "git@github.com:llvm/llvm-project.git" -Dimitry [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYCzbHwAKCRCwXqMKLiCW oyucAKDvrr57GutNCP9GaKo326Hgj1U6AgCeM0BzC8bcfXu3VgzwCtG3cyA1QR4= =vWEB -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?11EDC667-3CDE-4E1E-A73C-9350C18C9E37>