The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d418bc27e601ec6bba0506d0efb62eca5eda5ab8
commit d418bc27e601ec6bba0506d0efb62eca5eda5ab8 Author: Warner Losh <[email protected]> AuthorDate: 2022-01-07 05:34:18 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2022-01-07 05:34:18 +0000 libsoft: Remove runtime ldconfig support for libsoft Remove the runtime support for running ldconfig at boot to cache lists of libsoft libbraries. Sponsored by: Netflix --- libexec/rc/rc.conf | 6 ------ libexec/rc/rc.d/ldconfig | 21 --------------------- 2 files changed, 27 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index c6f1218ed98d..c2941c770b56 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -652,17 +652,11 @@ ldconfig_paths="/usr/lib/compat ${_localbase}/lib ${_localbase}/lib/compat/pkg" # shared library search paths ldconfig32_paths="/usr/lib32 /usr/lib32/compat" # 32-bit compatibility shared library search paths -ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat ${_localbase}/libsoft" - # soft float compatibility shared library search paths - # Note: temporarily with extra stuff for transition ldconfig_local_dirs="${_localbase}/libdata/ldconfig" # Local directories with ldconfig configuration files. ldconfig_local32_dirs="${_localbase}/libdata/ldconfig32" # Local directories with 32-bit compatibility ldconfig # configuration files. -ldconfig_localsoft_dirs="${_localbase}/libdata/ldconfigsoft" - # Local directories with soft float compatibility ldconfig - # configuration files. kern_securelevel_enable="NO" # kernel security level (see security(7)) kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure # Note that setting securelevel to 0 will result diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 03627df6da06..39c5f0f2a46d 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -64,27 +64,6 @@ ldconfig_start() ;; esac - case ${machine_arch} in - armv[67]) - for i in ${ldconfig_localsoft_dirs}; do - if [ -d "${i}" ]; then - _files=`find ${i} -type f` - if [ -n "${_files}" ]; then - ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`" - fi - fi - done - _LDC="" - for i in ${ldconfigsoft_paths}; do - if [ -r "${i}" ]; then - _LDC="${_LDC} ${i}" - fi - done - check_startmsgs && - echo 'Soft Float compatibility ldconfig path:' ${_LDC} - ${ldconfig} -soft ${_ins} ${_LDC} - ;; - esac fi }
