From owner-svn-src-all@freebsd.org Tue Nov 12 22:33:42 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F8151BD559; Tue, 12 Nov 2019 22:33:42 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47CMwP5LFdz4Clx; Tue, 12 Nov 2019 22:33:41 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id AFAC83C0199; Tue, 12 Nov 2019 22:33:34 +0000 (UTC) Date: Tue, 12 Nov 2019 22:33:34 +0000 From: Brooks Davis To: Guido Falsi Cc: Brooks Davis , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r354491 - in head: . lib/msun/src libexec libexec/rtld-elf libexec/rtld-elf32 share/mk usr.bin usr.bin/ldd32 Message-ID: <20191112223334.GA16457@spindle.one-eyed-alien.net> References: <201911072258.xA7MwBkh050268@repo.freebsd.org> <989e5f0c-fec1-48fc-78e3-744049cfcba8@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OXfL5xGRrasGEqWY" Content-Disposition: inline In-Reply-To: <989e5f0c-fec1-48fc-78e3-744049cfcba8@FreeBSD.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 47CMwP5LFdz4Clx X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-6.51 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; IP_SCORE(-3.61)[ip: (-9.44), ipnet: 199.48.128.0/22(-4.71), asn: 36236(-3.85), country: US(-0.05)]; R_SPF_NA(0.00)[]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2019 22:33:42 -0000 --OXfL5xGRrasGEqWY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=20 > > Log: > > libcompat: build 32-bit rtld and ldd as part of "everything" > > =20 > > 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. > > =20 > > Alter .PATH and CFLAGS settings in work when the Makefile is included. > > =20 > > While here only support LIB32 on supported platforms rather than alwa= ys > > enabling it and requiring users of MK_LIB32 to filter based > > TARGET/MACHINE_ARCH. > > =20 > > The net effect of this change is to make Makefile.libcompat only build > > compatability libraries. > > =20 > > Changes relative to r354449: > > =20 > > Correct detection of the compiler type when bsd.compat.mk is used > > outside Makefile.libcompat. Previously it always matched the clang > > case. > > =20 > > Set LDFLAGS including the linker emulation for mips where -m32 seems = to > > be insufficent. > > =20 > > Reviewed by: imp, kib (origional version in r354449) > > Obtained from: CheriBSD (conceptually) > > Sponsored by: DARPA, AFRL > > Differential Revision: https://reviews.freebsd.org/D22251 > >=20 >=20 > Hi, >=20 > I'm using pkgbase on my head machines and I'm getting this when > upgrading packages on head now: >=20 > 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 >=20 >=20 > So now these packages, which should be able to cohexist conflict on the > man page. >=20 > I'm not sure, but wthis commit looks like a good candidate for causing th= is. It turns out that I'd missed there being an MLINKS variable. The MAN?=3D part worked as designed but the new code was installing duplication links to rtld.1. Should be fixed in r354663. Thanks, Brooks --OXfL5xGRrasGEqWY Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJdyzM+AAoJEKzQXbSebgfANrMH/2xuzYRjMW3Kg6mNIahCszm4 Rb2cgqbm+5fnybxRLWYaPx9Ntra2L3cn0CvrcC8IG6oGEBL10Blf7X+DvJ31lqLO SU4Vrtvn5aemTep2j715HssXpLshL7ZcspxnBf4B97mEK8VYkzAgi53lCe2w0EVR xcdm6otH2xh6uILyYXsyZUnHoyfMllE+CeLLCgaSDHI64Zilx71X1ehPCTPKrerI R9UdE0S6A5eRoveizh8WPcdk2LsBTUcriiLmGOwqt7ytl1z2hk7avwIJ6rwe/b11 gmesyl+YNxAw860cB/BbSrV8UXvGLh80DF6/EvUE4ycUOCovx0J8MDOiZPRbjmw= =qD7/ -----END PGP SIGNATURE----- --OXfL5xGRrasGEqWY--