From nobody Sun Apr 26 18:07:46 2026 X-Original-To: dev-commits-src-all@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 4g3ZRw3G2gz6Zj68 for ; Sun, 26 Apr 2026 18:07:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-21.consmr.mail.gq1.yahoo.com (sonic310-21.consmr.mail.gq1.yahoo.com [98.137.69.147]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3ZRv5mnzz3NFP for ; Sun, 26 Apr 2026 18:07:55 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777226871; bh=/hkpBEZlv8EBK9OE9iFO/Pb4x9dB9r1T7lK7XDSMzwc=; h=Date:Subject:To:References:From:In-Reply-To:From:Subject:Reply-To; b=n/PEX89NL6YuCDqks5qYRRU3/KESzlS3yNYUR42xNAStSDOKbnQfA5rVIRPoAeBLJ9UysUdUK9D8d7n0ow9zotlaUrtgflIyonZaWxjuWH6R7Z9jV860Dn9+gT82uXA30ZoipZcFR+PCwW1sDz8TyPvP8CLt/fDmCKUaX+VWFARgFiQfIuzjKU3+Sk6fQqtFbjVVG0e+uK5keqCjEAeyqH6+Ld+XrySYVz9uMpGrUSb4utpBAPnO4MuFE4DyJCqMGH3efPmfrm8FZLShWuy9U9fIU4HYJ1DKXCMKMF+eJQ4W1ngpgM2OoL/E1afJrQUmSCjkNpSM6Tr53rwOKEK99Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777226871; bh=gwyDdDCNd72nBs2wufh3IgA9nhlC1oRq1I9dHa0ndQv=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=XYM22WxlBvwmkTklMCaeDp22yPUcupSCP7gpWECxLskBJUcc7QdbxrU9n4jmeJ8oQfes42iO+R6Ak5reiCoseJA9l5SdZg/AgUrXWqsgEHujRObgkzbU0HjUEqAeQiqh+8tBhbXQZuHLDHbP7zfVah7X3QvKsYSKTG4pQj2fEvpbF9mWhHhb1L81mYKuvgDdspFSm2Mc2xykwRDnpMh4FqMrfixON7Ol7t06QbO5qDfaFqUdtpDa2RKyjSm+r8PT+qskdVDHY0+0rheDvGWgylo38rKbPAcwIv7CbtcFKcjp14CUUBID6190Mjm9TRFPN/8jKGYwEnkov3Bx4cgtPg== X-YMail-OSG: 9J2KHPsVM1kx5AvPJjJtwIE0UGNOdRKSjQ1k4MmY1w8bN.hfXdWYc3Wjf2XSIEb 07C_yx8XkJQHP.UTwBXehs8Re26QhNnAJAE9gJpHiSr6spTF8UzLzlhugdjBlmExLEd833ey5I65 HAYWOiR.w1_VQwRV3vn98F8vHenUHMwAaFQNGV2sqvSw6t7u3lF_MQSxmgBQAk1YOewLVG_IT_t9 AizCffEAIvAphXnQZXH4xuyyJ7XBwqvNex.lbByt6WKBFVPd_D_FyfzVMyWWqymd4Ue5PYThf0ur PB9VJbgj5KzG.uKUze5O9WA8V4UtelicOr7vzigRGvCK2nXUd6NAxEWdtMDk0UA_elAtRowKwlNT pGP6eFnJIQgkIQddlWSI7j_BuzSuwsmmM7sC5a1pwLW8rpetqwOusi8_pGahq5XNOnI1QIVPsO3n 05VTofog3CD7Y7cGORY8dsa47fXTnQKwYwMK7xun4W0fp.vq78kyr_8jcR1ePgWtpNCbMoHcZSk9 p396VP6Zjlt1XhBRkkkADYi2osdhE1R6hjISL0RRut7bg4ZyLr2AXV6Wf7X4ErYutyB_PBRXMIBK DwvotDA91zsmqL_YILxewUD6YA.Iste040qrlvZleXkf2_uZEg1i7iPWiJOTtVi942PCgE.ViTVG 3D2OKaTIFqpKczafupRdS4SH_w.M8uh5bSOc9g6FWZUQCC1G4IMNHLQnXhM_ZpmM5PEO6s4KTbV6 .J8i0uMOixGbtRDytICWoboFZyN8HWQ0IF3RI4aHz.ab.uTi0H6L3kTGEnqLyvR3rfFuIZO4iy_3 vn8W6ul11O7.LiMC1DjHhqLyEpCk1SnsxXwTKRKmRGto5SIWcXcLMXE.Af33jFhuagSaZ83d1H8L 4pc1BOTInjCLNlQ9qSElukJ3YscaBsVNsUEZvaAUGsOWXPcCSbNaa3X.nuQq__jJq2j5HsAiVTvE iCAwNSrGkVek8GuzyVfjsXfU.JwSzLS2p2ag_Izx1VS6SCWIGNlP.qu3pucZ0QxJQZFdVZ5S.0vx 53DMyJyCfIO3zn6NbeKTtf8V7XPB72rHImrZPxAzh8trN0kO_JiopH2w.0Wk1av19OBPmtPL8SHb iZF6ur5Y8bHAX1gBAlLAqjjWLETeXzefWSanLhpFXicpMSPjXOwmhhabIhFNrY5NZy0AhlPwBgWT 2K3tFxO4_fKoWKotSI8F8gO.tgb5OH._Vm.zPgEGu5EmQlXr1Wh5i.EkwRlfAqjgqEgMu7IMNuin 0gVlFnkK2W5kwn.9PlmpyYKGod9BG7635dv2WN4aLDszvp7yJM_djmvsTM_SW0QXoRhmLiWFSkhg 4fDSOZ0cMUPFA8v.b4XaPABtRcZXylMPyuIYoz6ipaFOV2UiRQNeLAQrcFNbD.NmGteAR8LHDaP_ RD77jHhOcZEWEgdQ20Yv4oJmHrp4WbWC9wr9LDuQWxYUGhy5jB5RObBECpbRAD1b5MMrfZV7oG5N nX5cmUt5yE1_tPu3XGYSE0SVBBBBbSm9gMrWUBNxJpOgFffaSD3O9SBPJIA3XhCBi.Vkhnv.DoNc nVGqAVW.IAxu_FBSe8ju98srPXjVPb8VIDT3xpZ_6yS0lbov_2KkSENuhz74ZA6tV8i4R.G1Wn.U Fx_TCdVuspHwmlr6aPhBD4C7hX_XfZr0VWmIBwUAuYMdB9YTsUpuY.mZaegQedqPrk5Lk1qgplwc iExMNBu8m8yIzexIiCsjC3QEqaN9gvgd67pg15F8SB6Uz1oP43Xh0i8ixXVopXqSA22LgliRqVvD dtAyMt6wMzHdBtbsrw6O013S.SYKlKufcXdgI8FbYjXx8ekQYGKMjzZMmRkJjaVJmiNM.cfophMt J7q9sVHjniqnYb.bPXrLrAP0SOOR0_6VxJKqdkJOsK9NsgHk81JtY7A8qlbPeycm1QRzK1iun5ah JdR1KYaIxdZMkrjDgpGmfLb9qAOT.jDr157DFEP7yCN7UsoVmTDNHDBYoTVldmX2E1w_aVFoF8Nx zRzZILeN81DYlbXpS1fjN8dz5aFHSKnEZf4xYq7NQ8cXSWDzm0yGORhLB1OBVO75yHyIuaPIlLrC XYl8Yg8iABopTIIUFBk4lxhODc2EzXoet9OOvy_jdVJiEDnQn.ww4ZvsD9tFl74ki9liU7thy4fD xJ30rDuFfC5c31DEkhHsTdxF5tgMPPbjHFENCH1XnTG5rCSP6GjcmaPDZcJE9ILCGeTTPU0o9tLI PGZ715US20wkHTKFCPlvAS3cDzWXvFwxfaOkYLqIqdV0yMvI9i67clHoQmVfim7o6hGlHL0S_ir6 ckssvTMyJO41EUjrT7QzENsJRVT4OUWjlzWlflq870DxO0Q-- X-Sonic-MF: X-Sonic-ID: c2150e9c-323c-4300-8ae7-897e90122153 Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Sun, 26 Apr 2026 18:07:51 +0000 Received: by hermes--production-gq1-7bb7df5c46-m4r75 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID c607116cf625219bbfbb3c62f8760a8d; Sun, 26 Apr 2026 18:07:47 +0000 (UTC) Message-ID: <24a05f73-84a3-480f-b797-e0688753810c@yahoo.com> Date: Sun, 26 Apr 2026 11:07:46 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 4dd97955e68d - main - libpkgconf: Fix paths To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rg_rav?= , dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69ee1653.34850.61462b24@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: <69ee1653.34850.61462b24@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25559 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4g3ZRv5mnzz3NFP X-Spamd-Bar: ---- On 4/26/26 06:42, Dag-Erling Smørg rav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4dd97955e68df02b26d59e4e7c9a8167947a5164 > > commit 4dd97955e68df02b26d59e4e7c9a8167947a5164 > Author: Dag-Erling Smørgrav > AuthorDate: 2026-04-26 13:41:47 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-04-26 13:41:47 +0000 > > libpkgconf: Fix paths > > ${LOCALBASE:U} evaluates to exactly the same thing as ${LOCALBASE}. > Presumably what was meant was ${LOCALBASE:U/usr/local}. > > Fixes: b8352da33f34 ("pkgconf: import into the base system") > Reviewed by: khorben > Differential Revision: https://reviews.freebsd.org/D56642 > --- > lib/libpkgconf/Makefile | 4 ++-- > tools/build/depend-cleanup.sh | 4 ++++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile > index fee7f275d9ff..3cfb2172a00e 100644 > --- a/lib/libpkgconf/Makefile > +++ b/lib/libpkgconf/Makefile > @@ -14,8 +14,8 @@ INCS= bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h > > WARNS?= 3 > > -CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\" > -CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig\" > +CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\" > +CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" > CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" > CFLAGS+= -DSYSTEM_LIBDIR=\"/usr/lib\" > CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index e9c02d015368..c186c39a3448 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -317,6 +317,10 @@ check_epoch_and_opts > # "$OBJTOP"/tests/sys/kqueue/libkqueue/* > #fi > > +# 20250426 # libpkgconfig contains incorrect paths 2025 above is a typo? > +clean_obj lib/libpkgconf personality c pkgconfig:/share > +clean_obj lib/libpkgconf pkg c pkgconfig:/share > + > # 20251219 # libkrb5profile is now internal > for libcompat in "" $ALL_libcompats; do > dirprfx=${libcompat:+obj-lib${libcompat}} > > -- === Mark Millard marklmi at yahoo.com