From nobody Tue Feb 4 15:19:23 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 4YnRqX6gcvz5myR7; Tue, 04 Feb 2025 15:19:36 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnRqX1zdBz4KgN; Tue, 04 Feb 2025 15:19:36 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-6f6f61102adso1267577b3.1; Tue, 04 Feb 2025 07:19:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738682374; x=1739287174; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6wY16snSTGwt+8DStE4u7MIvHdy77ec6qiifeE3c3hU=; b=QZL+I29zgPjFdQYpGa5A6+BhmDpPApwktAOU+6fs4fFj/5IEkWvjNIO5FfLx5mOyoW NB4CMZpGbakY7gPznwagQNytwyr+eOTax0MDePnKQppt9zUmRBwa4hoyiQ4Tymr962ql Di0Rxz8FG2KFHBATV5JPEZG6rkGaa0xvVV9SNunpYFNbdbeQfkt+kEqKOxGa0GebiOX8 Dsty7OUXmEIM5HCSBhWLPpYbCCk0KJXNr6iK1Lo3y9OAjvK2dGSiVAt89Ry3K+qoW6JA u70rDnoSQy+iJEV52Nrlab3q1xh4MMyNrPe7wsRwsB/FZqe/9krkYCi202i+7Hn/G+RU p5sA== X-Forwarded-Encrypted: i=1; AJvYcCV6cah7q/Q9pZNR/SE3Pr4A3x4EZeU2lUrC5bHobxkABeo3++kH5CLl6mNtZJMIq+JW0WgIEaNeqrh7CTOSgYFxHZop@freebsd.org, AJvYcCWpyaHNKDM68ScyZXsEB7cfmRBDem29/GFOr/o9TH73ilaGm3uCOZSXWv9pJWejGetJByVkfpyhdcdjC1l2J1WJjatue1Q=@freebsd.org X-Gm-Message-State: AOJu0YzlpURfuNUgT6VinpCJZ6kUyRzudxEmrarW6vuOVmUqDJMdwkEw 4rlUt7BsuWhqlDnaAJ4zXn8q6V+uDnF5ACGlg4t22T9czW9VN31b509btVfg X-Gm-Gg: ASbGncuesxBgF3AnzVIqR5tfUWxIQ7yxZZTWQ9D+fct7lYbS+UNCDAuH5nHkaagUpor jwgpoopahkQVIkI6tZPqnrSOrKk1DDLtAYQYuH3SrtL4y9/jrF0N+XXfSoFNbHmZooYGWbAzfNE 7HwNq8uXdZtgXdHl8TsEjU+5qv9BlSRkCBj8efT0DFFXVOJ3nxpb8KcdXOcpMeHiv79r9sFSaCh G4zetcf2knctlzXAhtylVF5AY/KXbVPZhLy5bZqELOjytVvuNFaiVnBnD2wq2gzoL1Px02hWuYI fZ1gHlVTybNMyvkDpiJNV0+T1otFAir38272u2nIdj2MVF1g/3vT8fFn X-Google-Smtp-Source: AGHT+IGXBAAVsDEFGBJGuSHriubqV0WUuHDtJs0o+JqMfYr69YBmdRSAm/Z3CYSL1s4i3K89D/fOPA== X-Received: by 2002:a05:690c:112:b0:6ef:4f47:f21b with SMTP id 00721157ae682-6f976c73cf7mr16860547b3.5.1738682374603; Tue, 04 Feb 2025 07:19:34 -0800 (PST) Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com. [209.85.128.170]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f97eca9735sm1792607b3.1.2025.02.04.07.19.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 07:19:34 -0800 (PST) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-6f7d5f131d4so1131437b3.0; Tue, 04 Feb 2025 07:19:34 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUX7TxWgtgZMfwS2FoRINQwsjHDqGtq06I3D/9pl9DnmzFuYXr7MfrIVSv2S5Vot2yTSZnRHUEo011UCxkcc7v6+WMvNeg=@freebsd.org, AJvYcCWTcJ0FmhCmepR5jk0xuKckvfxizTyEqSnV8TUVDukdhpwec+oL7jKLuY2PO4oXn31Vx3AxGArA7i74Jx6NbDu/e9dk@freebsd.org X-Received: by 2002:a05:690c:660e:b0:6ef:5754:49e5 with SMTP id 00721157ae682-6f976b28c5cmr17004367b3.2.1738682374014; Tue, 04 Feb 2025 07:19:34 -0800 (PST) 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 References: <202502041448.514EmPpS004525@gitrepo.freebsd.org> <20250204151630.3A038223@slippy.cwsent.com> In-Reply-To: <20250204151630.3A038223@slippy.cwsent.com> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Tue, 4 Feb 2025 12:19:23 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWEUYZmvfn1aNOyVHh-PG_OB-R4NdV4AS6xDUVv-clFWD8xB83G_qfq49wu5yjc Message-ID: Subject: Re: git: 88d448ec815c - main - mk: Move vm stack test debug symbols To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4YnRqX1zdBz4KgN 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:15169, ipnet:209.85.128.0/17, country:US] Thank you, it was a last-minute mistake! Will fix it! On Tue, Feb 4, 2025 at 12:16=E2=80=AFPM Cy Schubert wrote: > > 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=3D88d448ec815c1fda27be9484= 6f88ccd9 > > 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+=3Dusr/tests/sys/vm/stack/.debug > > + > > # 20250129: libdevinfo bumped to version 7 > > OLD_LIBS+=3Dlib/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=3D${SHLIB_NAME}.full > > # Use ${DEBUGDIR} for base system debug files, else .debug subdirector= y > > .if ${_SHLIBDIR} =3D=3D "/boot" ||\ > > ${SHLIBDIR:C%/lib(/.*)?$%/lib%} =3D=3D "/lib" ||\ > > - ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} =3D=3D "= /usr/lib" > > + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} =3D=3D "/usr/lib"= || > > + ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} =3D=3D "/usr/tests" > > DEBUGFILEDIR=3D${DEBUGDIR}${_SHLIBDIR} > > .else > > DEBUGFILEDIR=3D${_SHLIBDIR}/.debug > > > > This broke buildworld. > > make[5]: "/opt/src/git-src/share/mk/bsd.lib.mk" line 255: Malformed > conditional '${_SHLIBDIR} =3D=3D "/boot" || ${SHLIBDIR:C%/lib(/.*)?$%/lib= %} =3D=3D > "/lib" || ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} =3D=3D "/usr/l= ib" ||' > 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=3D${SHLIB_NAME}.full > # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory > .if ${_SHLIBDIR} =3D=3D "/boot" ||\ > ${SHLIBDIR:C%/lib(/.*)?$%/lib%} =3D=3D "/lib" ||\ > - ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} =3D=3D "/usr/lib" |= | > + ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} =3D=3D "/usr/lib" |= |\ > ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} =3D=3D "/usr/tests" > DEBUGFILEDIR=3D${DEBUGDIR}${_SHLIBDIR} > .else > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > --=20 Jose Luis Duran