From nobody Thu May 21 18:18:10 2026 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 4gLxVT36H5z6fbGn for ; Thu, 21 May 2026 18:18:25 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gLxVT0Xl5z3WCq for ; Thu, 21 May 2026 18:18:25 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779387505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4lbmD1h3iFF7+QUaZZJuPtoTVlmLu5Mzi4VHRfDB/hA=; b=mk4vYPIx1Vz2N3X6wArd33chWvEt4aYAr6tvGCgj2v3AT4Q05TuKmqG+dghlh3IK1sjX9/ qc4xuGqKFl980BV5j4ca/Lzhj3OCCBi0quakdVKaC5txyF0r70tEFNR4UGE5TDkTUPOsc2 nec9BJCStSwY/duDlDgavi35kpaDNuopj7CN3wfC6j90LPRwS0JJPloS+apKLZUeOJrR3T Rcmr1y6IHjGYB2sZqXbahH4wRmpsuJIeY/n7jsCT6Bab3so1AQT7WtftBbxTASte+iM5Sa C0hFeaHt5ZeOYiu4Hec9oBgLDdAZZHKV+8gRUS91YNRQeboOdc+1dpNkVgLUBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779387505; a=rsa-sha256; cv=none; b=orQXsta+6zwA3QtTrgIru+iqk7gImkY8nfk60lJoSKnStxO/RqkPpbKkmZ9+P2aOqG+Agu EM+K8YQSWGsIrl4q+tWOQzSreLTNI7eObnosO1D8vYDqDCr1kDsf7xGvdWdlSh4dwMeqC9 NfdBaLTfwGYnqD0O+3URBx0A0FlsqRFY3Qn2DmQBHv0w6RmNMqwGnwpQQrmivV5ON/5mTS BvIAA3EKYGejvnheaKzuyhpX1zgcZBk0kJT2pWmfl2wq55tQJvlEvmbmMGSk/k/uANXn5T uFXMT0rp73c6MWH6FMGDvkluen0+kY0or9xNS1oGZD9dVX1h0tR5NmIyWmFNQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779387505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4lbmD1h3iFF7+QUaZZJuPtoTVlmLu5Mzi4VHRfDB/hA=; b=NXGL41bPiN+IvGQk7C8GrYIFytDxl2ItTMRDeUxxyFVtlw+V+KNMd+ylIiWsPraCeNo2tt lbi8lP/mR6bAS97RSbZ1rzZYO3eVgoTuij1i3o8VMQs3c32BozEFab0+wZQuAkuOSrfD8H wMuzE8V4URcl6ss6O7qp6pASzrGtaALZn9YoMnntZOGItSzceyy+uFpsiUKA5N/5CUlhnv ZDS3kDTgoERBvNXEviUpGUBFoKdCGtebiWG4RBuYPRV+izE1T1mNL5BZ4SNozx5GhnLVnu MUT/p5suPcThJlJZisMuq4xEg2dn2jtdGwVusoFxNLaL9ApOrKS/I2NnXqczmQ== Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gLxVS6yTzzNwV for ; Thu, 21 May 2026 18:18:24 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-38e8de47ed4so7852011fa.1 for ; Thu, 21 May 2026 11:18:24 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/b5IyyfxVng/cWL1LmtHbd+KV8mE4I/82o+veOQpLljESHh+2OV15uxBdDR1hjz0EgXqNKDhntbTkraCYxbaeUZDLjZw==@freebsd.org X-Gm-Message-State: AOJu0YwnWIZw5u6ktAjH5JnMYyMl6WD5MI1DVL5GKoazCiE5gkrke9/P lr+zDGumVIB6eaItbP7xAEF4C9XrdYOAQjUgdQpBrRimamhhROzWuK9pxt6mC2veIqao1n3bQML Mfi02xxqLlEozAx9g8dYvIL6MsQHoy34= X-Received: by 2002:a2e:bd06:0:b0:393:b135:aa60 with SMTP id 38308e7fff4ca-395d8c364e8mr43981fa.2.1779387503483; Thu, 21 May 2026 11:18:23 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69ee1653.34850.61462b24@gitrepo.freebsd.org> <24a05f73-84a3-480f-b797-e0688753810c@yahoo.com> In-Reply-To: <24a05f73-84a3-480f-b797-e0688753810c@yahoo.com> From: Nuno Teixeira Date: Thu, 21 May 2026 19:18:10 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4IU-VFlLQ_Uj2AV6nUdKdOZypeZupuFFIUXE33AHq1rwZ3A7o6oAj2eXnE Message-ID: Subject: Re: git: 4dd97955e68d - main - libpkgconf: Fix paths To: Mark Millard Cc: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rg_rav?= , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001020ae065257f0a8" --0000000000001020ae065257f0a8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, This change doens't honour PREFIX when it is set to other path than default "/usr/local/" -CFLAGS+=3D -DPERSONALITY_PATH=3D\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/p= ersonality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\" -CFLAGS+=3D -DPKG_DEFAULT_PATH=3D\"${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgco= nfig:${LOCALBASE:U}/share/pkgconfig\" +CFLAGS+=3D -DPERSONALITY_PATH=3D\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/p= ersonality.d:${LOCALBASE:U/usr/local}/etc/ pkgconfig/personality.d\" +CFLAGS+=3D -DPKG_DEFAULT_PATH=3D\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/lib= data/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D295439 Thanks, Mark Millard escreveu (domingo, 26/04/2026 =C3=A0(s) 19= :08): > On 4/26/26 06:42, Dag-Erling Sm=C3=B8rg rav wrote: > > The branch main has been updated by des: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D4dd97955e68df02b26d59e4e7c9a816= 7947a5164 > > > > commit 4dd97955e68df02b26d59e4e7c9a8167947a5164 > > Author: Dag-Erling Sm=C3=B8rgrav > > AuthorDate: 2026-04-26 13:41:47 +0000 > > Commit: Dag-Erling Sm=C3=B8rgrav > > 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=3D bsdstubs.h iter.h libpkgconf-ap= i.h > libpkgconf.h stdinc.h > > > > WARNS?=3D 3 > > > > -CFLAGS+=3D > -DPERSONALITY_PATH=3D\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig= /personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\" > > -CFLAGS+=3D > -DPKG_DEFAULT_PATH=3D\"${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkg= config:${LOCALBASE:U}/share/pkgconfig\" > > +CFLAGS+=3D > -DPERSONALITY_PATH=3D\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig= /personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\" > > +CFLAGS+=3D > -DPKG_DEFAULT_PATH=3D\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/l= ibdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" > > CFLAGS+=3D -DSYSTEM_INCLUDEDIR=3D\"/usr/include\" > > CFLAGS+=3D -DSYSTEM_LIBDIR=3D\"/usr/lib\" > > CFLAGS+=3D -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=3D${libcompat:+obj-lib${libcompat}} > > > > > > > -- > =3D=3D=3D > Mark Millard > marklmi at yahoo.com > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000001020ae065257f0a8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

This change doens't= honour PREFIX when it is set to other path than default "/usr/local/&= quot;

-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DPERSONALITY_PATH=3D\&q= uot;/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCAL= BASE:U}/etc/pkgconfig/personality.d\"
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DPKG_DEFAULT_PATH=3D\"${LOCALBA= SE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconf= ig\"
+CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DPERSONALITY_PATH=3D\"/usr/shar= e/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/lo= cal}/etc/pkgconfig/personality.d\"
+CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DPKG_DEFAULT_PATH=3D\"${LOCALBA= SE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/= local}/share/pkgconfig\"

Please see https://bugs.freebsd.org/= bugzilla/show_bug.cgi?id=3D295439

Thanks,

Mark Millard <marklmi@yahoo.co= m> escreveu (domingo, 26/04/2026 =C3=A0(s) 19:08):
On 4/26/26 06:42, Dag-Erling Sm= =C3=B8rg rav wrote:
> The branch main has been updated by des:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D4dd97955e68df02b26d59e4e7c9a8167947a5164<= /a>
>
> commit 4dd97955e68df02b26d59e4e7c9a8167947a5164
> Author:=C2=A0 =C2=A0 =C2=A0Dag-Erling Sm=C3=B8rgrav <des@FreeBSD.or= g>
> AuthorDate: 2026-04-26 13:41:47 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Dag-Erling Sm=C3=B8rgrav <des@FreeBSD.or= g>
> CommitDate: 2026-04-26 13:41:47 +0000
>
>=C2=A0 =C2=A0 =C2=A0libpkgconf: Fix paths
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0${LOCALBASE:U} evaluates to exactly the same thing = as ${LOCALBASE}.
>=C2=A0 =C2=A0 =C2=A0Presumably what was meant was ${LOCALBASE:U/usr/loc= al}.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 b8352da33f= 34 ("pkgconf: import into the base system")
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 khorben
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D56642
> ---
>=C2=A0 lib/libpkgconf/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0| 4 ++--
>=C2=A0 tools/build/depend-cleanup.sh | 4 ++++
>=C2=A0 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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h
>=C2=A0
>=C2=A0 WARNS?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3
>=C2=A0
> -CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DPERSONALITY_PATH=3D\"/usr/share/= pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkg= config/personality.d\"
> -CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DPKG_DEFAULT_PATH=3D\"${LOCALBASE= :U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig= \"
> +CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DPERSONALITY_PATH=3D\"/usr/share/= pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/loca= l}/etc/pkgconfig/personality.d\"
> +CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DPKG_DEFAULT_PATH=3D\"${LOCALBASE= :U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/lo= cal}/share/pkgconfig\"
>=C2=A0 CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DSYSTEM_INCLUDEDIR=3D\"/usr/= include\"
>=C2=A0 CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-DSYSTEM_LIBDIR=3D\"/usr/lib\= "
>=C2=A0 CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0-I${SRCTOP}/lib/libpkgconf -I${PKG= CONFDIR}
> diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanu= p.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
>=C2=A0 #=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "$OBJTOP"/tests/sy= s/kqueue/libkqueue/*
>=C2=A0 #fi
>=C2=A0
> +# 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
> +
>=C2=A0 # 20251219 # libkrb5profile is now internal
>=C2=A0 for libcompat in "" $ALL_libcompats; do
>=C2=A0 =C2=A0 =C2=A0 =C2=A0dirprfx=3D${libcompat:+obj-lib${libcompat}}<= br> >
>


--
=3D=3D=3D
Mark Millard
marklmi at yahoo.com



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000001020ae065257f0a8--