On Tue, Nov 12, 2019 at 10:14:28PM +0100, Guido Falsi wrote: > On 07/11/19 23:58, Brooks Davis wrote: > > Author: brooks > > Date: Thu Nov 7 22:58:10 2019 > > New Revision: 354491 > > URL: https://svnweb.freebsd.org/changeset/base/354491 > > > > Log: > > libcompat: build 32-bit rtld and ldd as part of "everything" > > > > Alter bsd.compat.mk to set MACHINE and MACHINE_ARCH when included > > directly so MD paths in Makefiles work. In the process centralize > > setting them in LIBCOMPATWMAKEENV. > > > > Alter .PATH and CFLAGS settings in work when the Makefile is included. > > > > While here only support LIB32 on supported platforms rather than always > > enabling it and requiring users of MK_LIB32 to filter based > > TARGET/MACHINE_ARCH. > > > > The net effect of this change is to make Makefile.libcompat only build > > compatability libraries. > > > > Changes relative to r354449: > > > > Correct detection of the compiler type when bsd.compat.mk is used > > outside Makefile.libcompat. Previously it always matched the clang > > case. > > > > Set LDFLAGS including the linker emulation for mips where -m32 seems to > > be insufficent. > > > > Reviewed by: imp, kib (origional version in r354449) > > Obtained from: CheriBSD (conceptually) > > Sponsored by: DARPA, AFRL > > Differential Revision: https://reviews.freebsd.org/D22251 > > > > Hi, > > I'm using pkgbase on my head machines and I'm getting this when > upgrading packages on head now: > > Checking integrity... done (1 conflicting) > - FreeBSD-clibs-lib32-13.0.s20191112204216 [mpnet-base] conflicts with > FreeBSD-clibs-13.0.s20191112204216 [installed] on > /usr/share/man/man1/ld-elf.so.1.1.gz > > > So now these packages, which should be able to cohexist conflict on the > man page. > > I'm not sure, but wthis commit looks like a good candidate for causing this.
It turns out that I'd missed there being an MLINKS variable. The MAN?= part worked as designed but the new code was installing duplication links to rtld.1. Should be fixed in r354663. Thanks, Brooks
signature.asc
Description: PGP signature