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

libcasper: Move helper libraries from /lib/casper to /lib. 

These libraries are linked to directly by applications rather than
opened at runtime via dlopen().

Discussed with:	oshogbo
Reviewed by:	markj, emaste
Differential Revision:	https://reviews.freebsd.org/D39245
This commit is contained in:
John Baldwin 2023-03-29 15:04:28 -07:00
parent a1254dcaa8
commit 7d8e1e8dd9
14 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -1076,8 +1076,7 @@ _bootstrap-tools:
${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
.endif
${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \
${WORLDTMP}/bin
mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/geom ${WORLDTMP}/bin
${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${WORLDTMP}/usr >/dev/null
${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \

11
ObsoleteFiles.inc
View File

@ -52,6 +52,17 @@
# xargs -n1 | sort | uniq -d;
# done
# 20230329: libcasper libraries moved to /lib
MOVED_LIBS+=lib/casper/libcap_dns.so.2
MOVED_LIBS+=lib/casper/libcap_fileargs.so.1
MOVED_LIBS+=lib/casper/libcap_grp.so.1
MOVED_LIBS+=lib/casper/libcap_net.so.1
MOVED_LIBS+=lib/casper/libcap_pwd.so.1
MOVED_LIBS+=lib/casper/libcap_sysctl.so.1
MOVED_LIBS+=lib/casper/libcap_sysctl.so.2
MOVED_LIBS+=lib/casper/libcap_syslog.so.1
OLD_DIRS+=lib/casper
# 20230324: libvmmapi shlib version bumped to 6
OLD_LIBS+=usr/lib/libvmmapi.so.5

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

@ -104,8 +104,6 @@
..
..
lib
casper
..
geom
..
nvmecontrol

2
lib/libcasper/services/cap_dns/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_fileargs/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_grp/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_net/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_netdb/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_pwd/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_sysctl/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
lib/libcasper/services/cap_syslog/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SHLIBDIR?= /lib/casper
SHLIBDIR?= /lib
.include <src.opts.mk>

2
libexec/rtld-elf/rtld_paths.h
View File

@ -69,7 +69,7 @@
#endif
#ifndef STANDARD_LIBRARY_PATH
#define STANDARD_LIBRARY_PATH "/lib/casper:/lib:/usr/lib"
#define STANDARD_LIBRARY_PATH "/lib:/usr/lib"
#endif
#ifndef LD_

1
tools/build/Makefile
View File

@ -354,7 +354,6 @@ host-symlinks:
# yet (this happens if we are crossbuilding from Linux/Mac).
INSTALLDIR_LIST= \
bin \
lib/casper \
lib/geom \
usr/include/casper \
usr/include/private/ucl \

16
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -855,14 +855,14 @@ OLD_DIRS+=usr/tests/usr.bin/calendar
.if ${MK_CASPER} == no
OLD_LIBS+=lib/libcasper.so.1
OLD_LIBS+=lib/casper/libcap_dns.so.2
OLD_LIBS+=lib/casper/libcap_fileargs.so.1
OLD_LIBS+=lib/casper/libcap_grp.so.1
OLD_LIBS+=lib/casper/libcap_net.so.1
OLD_LIBS+=lib/casper/libcap_pwd.so.1
OLD_LIBS+=lib/casper/libcap_sysctl.so.1
OLD_LIBS+=lib/casper/libcap_sysctl.so.2
OLD_LIBS+=lib/casper/libcap_syslog.so.1
OLD_LIBS+=lib/libcap_dns.so.2
OLD_LIBS+=lib/libcap_fileargs.so.1
OLD_LIBS+=lib/libcap_grp.so.1
OLD_LIBS+=lib/libcap_net.so.1
OLD_LIBS+=lib/libcap_pwd.so.1
OLD_LIBS+=lib/libcap_sysctl.so.1
OLD_LIBS+=lib/libcap_sysctl.so.2
OLD_LIBS+=lib/libcap_syslog.so.1
.endif
.if ${MK_CCD} == no