FreeBSD Mail Archives

Date:      Thu, 21 May 2026 19:18:10 +0100
From:      Nuno Teixeira <eduardo@freebsd.org>
To:        Mark Millard <marklmi@yahoo.com>
Cc:        =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rg_rav?= <des@freebsd.org>,  dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject:   Re: git: 4dd97955e68d - main - libpkgconf: Fix paths
Message-ID:  <CAFDf7U%2Bz16qRxMWA%2B=iq_GapPp1T3gfTnibn5rp-cKSmWmMP4w@mail.gmail.com>
In-Reply-To: <24a05f73-84a3-480f-b797-e0688753810c@yahoo.com>
References:  <69ee1653.34850.61462b24@gitrepo.freebsd.org> <24a05f73-84a3-480f-b797-e0688753810c@yahoo.com>

index | next in thread | previous in thread | raw e-mail


[-- Attachment #1 --]
Hello,

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

-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\"

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

Thanks,

Mark Millard <marklmi@yahoo.com> escreveu (domingo, 26/04/2026 à(s) 19:08):

> 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 <des@FreeBSD.org>
> > AuthorDate: 2026-04-26 13:41:47 +0000
> > Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
> > 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
>
>

-- 
Nuno Teixeira
FreeBSD UNIX:  <eduardo@FreeBSD.org>   Web:  https://FreeBSD.org

[-- Attachment #2 --]
<div dir="ltr"><div><div><div>Hello,<br><br></div>This change doens&#39;t honour PREFIX when it is set to other path than default &quot;/usr/local/&quot;<br><br>-CFLAGS+=       -DPERSONALITY_PATH=\&quot;/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\&quot;<br>
-CFLAGS+=       -DPKG_DEFAULT_PATH=\&quot;${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig\&quot;<br>
+CFLAGS+=       -DPERSONALITY_PATH=\&quot;/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/<span class="gmail-il">pkg</span>config/personality.d\&quot;<br>
+CFLAGS+=       -DPKG_DEFAULT_PATH=\&quot;${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\&quot;<br><br></div>Please see <a href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=295439">https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=295439</a><br><br></div>Thanks,</div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">Mark Millard &lt;<a href="mailto:marklmi@yahoo.com">marklmi@yahoo.com</a>&gt; escreveu (domingo, 26/04/2026 à(s) 19:08):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 4/26/26 06:42, Dag-Erling Smørg rav wrote:<br>
&gt; The branch main has been updated by des:<br>
&gt; <br>
&gt; URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=4dd97955e68df02b26d59e4e7c9a8167947a5164" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=4dd97955e68df02b26d59e4e7c9a8167947a5164</a><br>;
&gt; <br>
&gt; commit 4dd97955e68df02b26d59e4e7c9a8167947a5164<br>
&gt; Author:     Dag-Erling Smørgrav &lt;des@FreeBSD.org&gt;<br>
&gt; AuthorDate: 2026-04-26 13:41:47 +0000<br>
&gt; Commit:     Dag-Erling Smørgrav &lt;des@FreeBSD.org&gt;<br>
&gt; CommitDate: 2026-04-26 13:41:47 +0000<br>
&gt; <br>
&gt;     libpkgconf: Fix paths<br>
&gt;     <br>
&gt;     ${LOCALBASE:U} evaluates to exactly the same thing as ${LOCALBASE}.<br>
&gt;     Presumably what was meant was ${LOCALBASE:U/usr/local}.<br>
&gt;     <br>
&gt;     Fixes:          b8352da33f34 (&quot;pkgconf: import into the base system&quot;)<br>
&gt;     Reviewed by:    khorben<br>
&gt;     Differential Revision:  <a href="https://reviews.freebsd.org/D56642" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D56642</a><br>;
&gt; ---<br>
&gt;  lib/libpkgconf/Makefile       | 4 ++--<br>
&gt;  tools/build/depend-cleanup.sh | 4 ++++<br>
&gt;  2 files changed, 6 insertions(+), 2 deletions(-)<br>
&gt; <br>
&gt; diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile<br>
&gt; index fee7f275d9ff..3cfb2172a00e 100644<br>
&gt; --- a/lib/libpkgconf/Makefile<br>
&gt; +++ b/lib/libpkgconf/Makefile<br>
&gt; @@ -14,8 +14,8 @@ INCS=               bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h<br>
&gt;  <br>
&gt;  WARNS?=              3<br>
&gt;  <br>
&gt; -CFLAGS+=     -DPERSONALITY_PATH=\&quot;/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\&quot;<br>
&gt; -CFLAGS+=     -DPKG_DEFAULT_PATH=\&quot;${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig\&quot;<br>
&gt; +CFLAGS+=     -DPERSONALITY_PATH=\&quot;/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\&quot;<br>
&gt; +CFLAGS+=     -DPKG_DEFAULT_PATH=\&quot;${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\&quot;<br>
&gt;  CFLAGS+=     -DSYSTEM_INCLUDEDIR=\&quot;/usr/include\&quot;<br>
&gt;  CFLAGS+=     -DSYSTEM_LIBDIR=\&quot;/usr/lib\&quot;<br>
&gt;  CFLAGS+=     -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR}<br>
&gt; diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh<br>
&gt; index e9c02d015368..c186c39a3448 100755<br>
&gt; --- a/tools/build/depend-cleanup.sh<br>
&gt; +++ b/tools/build/depend-cleanup.sh<br>
&gt; @@ -317,6 +317,10 @@ check_epoch_and_opts<br>
&gt;  #          &quot;$OBJTOP&quot;/tests/sys/kqueue/libkqueue/*<br>
&gt;  #fi<br>
&gt;  <br>
&gt; +# 20250426 # libpkgconfig contains incorrect paths<br>
<br>
2025 above is a typo?<br>
<br>
&gt; +clean_obj lib/libpkgconf personality c pkgconfig:/share<br>
&gt; +clean_obj lib/libpkgconf pkg c pkgconfig:/share<br>
&gt; +<br>
&gt;  # 20251219 # libkrb5profile is now internal<br>
&gt;  for libcompat in &quot;&quot; $ALL_libcompats; do<br>
&gt;       dirprfx=${libcompat:+obj-lib${libcompat}}<br>
&gt; <br>
&gt; <br>
<br>
<br>
-- <br>
===<br>
Mark Millard<br>
marklmi at <a href="http://yahoo.com" rel="noreferrer" target="_blank">yahoo.com</a><br>
<br>
</blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888">
FreeBSD UNIX:  &lt;eduardo@FreeBSD.org&gt;   Web:  <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;

home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7U%2Bz16qRxMWA%2B=iq_GapPp1T3gfTnibn5rp-cKSmWmMP4w>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation