d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install working pkgconfig .pc files for compat libraries

Browse Source 
The default ones are install them to /usr/libdata/pkgconfig, and we can't
use this path for compat libraries, so we use /usr/lib<suffix>/pkgconfigi here.

Test Plan:	grep -rn libdir= ./usr/lib32/pkgconfig/*.pc
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D34939
This commit is contained in:
Alex Richardson 2022-08-11 23:17:52 +01:00
parent 92b5b97cb0
commit ac175bd33a
12 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.libcompat
View File

@ -15,6 +15,7 @@ LIBCOMPATWMAKEENV+= \
SYSROOT=${WORLDTMP} \
LIBDIR=/usr/lib${libcompat} \
SHLIBDIR=/usr/lib${libcompat} \
LIBDATADIR=/usr/lib${libcompat} \
DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
.if ${MK_META_MODE} != "no"
# Don't rebuild build-tools targets during normal build.

2
etc/mtree/BSD.lib32.dist
View File

@ -18,5 +18,7 @@
encoder
..
..
pkgconfig
..
..
..

5
lib/liblzma/Makefile
View File

@ -159,8 +159,9 @@ PCFILES= liblzma.pc
liblzma.pc: liblzma.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,/usr,g ; \
s,@libdir@,/usr/lib,g ; \
s,@includedir@,/usr/include,g ; \
s,@libdir@,${LIBDIR},g ; \
s,@sharedlibdir@,${SHLIBDIR},g ; \
s,@includedir@,${INCLUDEDIR},g ; \
s,@LIBS@,-pthread -lmd,g ; \
s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \

6
lib/libmagic/Makefile
View File

@ -42,9 +42,9 @@ PACKAGE_VERSION!= sed -n '/define.*PACKAGE_VERSION/{s,[^0-9.],,gp;q;}' ${.CURDIR
libmagic.pc: libmagic.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
s,@libdir@,$${exec_prefix}/lib,g ; \
s,@sharedlibdir@,$${libdir},g ; \
s,@includedir@,$${prefix}/include,g ; \
s,@libdir@,${LIBDIR},g ; \
s,@sharedlibdir@,${SHLIBDIR},g ; \
s,@includedir@,${INCLUDEDIR},g ; \
s,@VERSION@,${PACKAGE_VERSION},g ; \
s,@LIBS@,,g ;' \
${.ALLSRC} > ${.TARGET}

6
lib/libusb/Makefile
View File

@ -35,6 +35,12 @@ SRCS+= libusb10_hotplug.c
SRCS+= libusb10_io.c
PCFILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
.for pcfile in ${PCFILES}
${pcfile}: ${pcfile}.in
sed -e 's,@libdir@,${LIBDIR},g ; s,@sharedlibdir@,${SHLIBDIR},g ; \
s,@includedir@,${INCLUDEDIR},g ;' ${.ALLSRC} > ${.TARGET}
.endfor
CLEANFILES+= ${PCFILES}
#
# Cross platform support

5
lib/libusb/libusb-0.1.pc → lib/libusb/libusb-0.1.pc.in
View File

@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
libdir=@libdir@
sharedlibdir=@sharedlibdir@
includedir=@includedir@
Name: libusb-0.1
Description: Library that abstracts ways to access USB devices (v0.1)

5
lib/libusb/libusb-1.0.pc → lib/libusb/libusb-1.0.pc.in
View File

@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
libdir=@libdir@
sharedlibdir=@sharedlibdir@
includedir=@includedir@
Name: libusb-1.0
Description: Library that abstracts ways to access USB devices (v1.0)

5
lib/libusb/libusb-2.0.pc → lib/libusb/libusb-2.0.pc.in
View File

@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
libdir=@libdir@
sharedlibdir=@sharedlibdir@
includedir=@includedir@
Name: libusb-2.0
Description: Library that abstracts ways to access USB devices (v2.0)

6
lib/libz/Makefile
View File

@ -63,9 +63,9 @@ ZLIB_VERSION!= sed -n '/define.*ZLIB_VERSION/{s,[^0-9.],,gp;q;}' ${ZLIBSRC}/zlib
zlib.pc: zlib.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
s,@libdir@,$${exec_prefix}/lib,g ; \
s,@sharedlibdir@,$${libdir},g ; \
s,@includedir@,$${prefix}/include,g ; \
s,@libdir@,${LIBDIR},g ; \
s,@sharedlibdir@,${SHLIBDIR},g ; \
s,@includedir@,${INCLUDEDIR},g ; \
s,@VERSION@,${ZLIB_VERSION},g ;' \
${.ALLSRC} > ${.TARGET}

4
lib/ncurses/tinfo/Makefile
View File

@ -1038,9 +1038,9 @@ gen-pkgconfig: gen-pkgconfig.in
s,@PC_MODULE_SUFFIX@,,g ; \
s,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
s,@includedir@,/usr/include,g ; \
s,@includedir@,${INCLUDEDIR},g ; \
s,@includesubdir@,,g ; \
s,@libdir@,/usr/lib,g ; \
s,@libdir@,${LIBDIR},g ; \
s,@RPATH_LIST@,$${libdir},g ; \
s,@PRIVATE_LIBS@,,g ; \
s,@USE_ARG_SUFFIX@,,g ; \

1
share/mk/bsd.compat.mk
View File

@ -122,6 +122,7 @@ LIBCOMPATCFLAGS+= -B${WORLDTMP}/usr/lib${libcompat}
.if defined(WANT_COMPAT)
LIBDIR_BASE:= /usr/lib${libcompat}
LIBDATADIR:= /usr/lib${libcompat}
_LIB_OBJTOP= ${LIBCOMPAT_OBJTOP}
CFLAGS+= ${LIBCOMPATCFLAGS}
LDFLAGS+= ${CFLAGS} ${LIBCOMPATLDFLAGS}

2
share/mk/bsd.lib.mk
View File

@ -470,7 +470,7 @@ installpcfiles: installpcfiles-${pcfile}
installpcfiles-${pcfile}: ${pcfile}
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} \
${.ALLSRC} ${DESTDIR}${LIBDATADIR}/pkgconfig
${.ALLSRC} ${DESTDIR}${LIBDATADIR}/pkgconfig/
.endfor
.endif
installpcfiles: .PHONY