libpkgconf: Fix paths
${LOCALBASE:U} evaluates to exactly the same thing as ${LOCALBASE}.
Presumably what was meant was ${LOCALBASE:U/usr/local}.
Fixes: b8352da33f ("pkgconf: import into the base system")
Reviewed by: khorben
Differential Revision: https://reviews.freebsd.org/D56642
This commit is contained in:
@@ -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}
|
||||
|
||||
@@ -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}}
|
||||
|
||||
Reference in New Issue
Block a user