git: 4dd97955e68d - main - libpkgconf: Fix paths
- Reply: Mark Millard : "Re: git: 4dd97955e68d - main - libpkgconf: Fix paths"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Apr 2026 13:42:43 UTC
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
+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}}