From nobody Tue Feb 04 15:16:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YnRm22Gfcz5myKT; Tue, 04 Feb 2025 15:16:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnRm14ZYqz4KSM; Tue, 04 Feb 2025 15:16:33 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id fHnLtqhO7yLQGfKfAt71NU; Tue, 04 Feb 2025 15:16:32 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id fKf8tu1Vwl5eGfKf9tr0k7; Tue, 04 Feb 2025 15:16:32 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=EO6l0EZC c=1 sm=1 tr=0 ts=67a22f50 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=T2h4t0Lz3GQA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=Ny0wPEL5L6wN-3XeyscA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 6B9E716C; Tue, 04 Feb 2025 07:16:30 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 3A038223; Tue, 04 Feb 2025 07:16:30 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Jose Luis Duran cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 88d448ec815c - main - mk: Move vm stack test debug symbols In-reply-to: <202502041448.514EmPpS004525@gitrepo.freebsd.org> References: <202502041448.514EmPpS004525@gitrepo.freebsd.org> Comments: In-reply-to Jose Luis Duran message dated "Tue, 04 Feb 2025 14:48:25 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 04 Feb 2025 07:16:30 -0800 Message-Id: <20250204151630.3A038223@slippy.cwsent.com> X-CMAE-Envelope: MS4xfH6qT9JR9nD/RlrwKHZ12xDcPIacHI7TYWrg2h7v5MTBZnTBXZbvLTUs2b6tINHfP2yJ5Bz5QG0X6+lXM1erXPnSHSPVwaK0Y7wQV6vKpxMxR1cAHxTo VvcyRcrsZVwOEmLX1iV5E1OAaaUUuLpPWc3PDcJQtVLGcCx70svD6aEwAesloVTK/qm1UclRF7OJ5E5j6238hG01tQbauGYcDG5yj2aCgc9o1mXx4k7SDLfO 7QI9m0skQ+qnQRz2qX67il4aVHvWy6M3QVUc/xGKMp+eytF3V+r8DbzDBm2lp+l6z7r2yWzy8vOQ+xihwld4cvkCzadLTUWq5a6kA4upQPU= X-Rspamd-Queue-Id: 4YnRm14ZYqz4KSM X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202502041448.514EmPpS004525@gitrepo.freebsd.org>, Jose Luis Duran w rites: > The branch main has been updated by jlduran: > > URL: https://cgit.FreeBSD.org/src/commit/?id=88d448ec815c1fda27be94846f88ccd9 > 6251febd > > commit 88d448ec815c1fda27be94846f88ccd96251febd > Author: Jose Luis Duran > AuthorDate: 2025-02-04 14:47:24 +0000 > Commit: Jose Luis Duran > CommitDate: 2025-02-04 14:47:24 +0000 > > mk: Move vm stack test debug symbols > > Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by > placing sys/vm/stack test debug symbols under /usr/lib/debug. > > Reviewed by: emaste > Approved by: emaste (mentor) > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D48796 > --- > ObsoleteFiles.inc | 3 +++ > share/mk/bsd.lib.mk | 3 ++- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index e17ca9608cca..aff94af72c17 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -51,6 +51,9 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20250204: sys/vm/stack test symbols moved to /usr/lib/debug > +OLD_DIRS+=usr/tests/sys/vm/stack/.debug > + > # 20250129: libdevinfo bumped to version 7 > OLD_LIBS+=lib/libdevinfo.so.6 > > diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk > index cf8057907a1f..a4b2e4d11125 100644 > --- a/share/mk/bsd.lib.mk > +++ b/share/mk/bsd.lib.mk > @@ -254,7 +254,8 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full > # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory > .if ${_SHLIBDIR} == "/boot" ||\ > ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ > - ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" > + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" || > + ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests" > DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR} > .else > DEBUGFILEDIR=${_SHLIBDIR}/.debug > This broke buildworld. make[5]: "/opt/src/git-src/share/mk/bsd.lib.mk" line 255: Malformed conditional '${_SHLIBDIR} == "/boot" || ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" || ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||' in /opt/src/git-src/kerberos5/lib/libasn1/Makefile:129 in directory /opt/src/git-src/kerberos5/lib/libasn1 This patch will fix it. diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index a4b2e4d11125..b7d6b333523b 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -254,7 +254,7 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory .if ${_SHLIBDIR} == "/boot" ||\ ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\ - ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" || + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||\ ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests" DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR} .else -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0