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

Since INSTALLS_SHLIB has been superseded by USE_LDCONFIG in bsd.port.mk, I

Browse Source 
expect to see quite a few files appearing in libdata/ldconfig directories.
This change avoids the screen to be filled with the names of those ldconfig
files and replace them by the actual non-default directories they contain.
Most of them will be ${PREFIX}/lib so, 'sort -u' will help reducing the
output.

Approved by:	cperciva (implicit)
MFC after:	1 week
This commit is contained in:
Florent Thoumie 2006-06-21 10:22:44 +00:00
parent 2c5e89c2d3
commit 99762b28b6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=159833
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/rc.d/ldconfig
View File

@ -17,6 +17,8 @@ stop_cmd=":"
ldconfig_start()
{
local _files
_ins=
ldconfig=${ldconfig_command}
checkyesno ldconfig_insecure && _ins="-i"
@ -24,7 +26,10 @@ ldconfig_start()
_LDC="/lib /usr/lib"
for i in ${ldconfig_local_dirs}; do
if [ -d "${i}" ]; then
ldconfig_paths="${ldconfig_paths} `find ${i} -type f`"
_files=`find ${i} -type f`
if [ -n "${_files}" ]; then
ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`"
fi
fi
done
for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
@ -39,7 +44,10 @@ ldconfig_start()
amd64)
for i in ${ldconfig_local32_dirs}; do
if [ -d "${i}" ]; then
ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`"
_files=`find ${i} -type f`
if [ -n "${_files}" ]; then
ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
fi
fi
done
echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths}