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

ldconfig: fetch hw.machine_arch only once

Browse Source 
This happens to be of significance with poudriere which runs the script a lot
when installing packages.
This commit is contained in:
Mateusz Guzik 2019-11-30 17:30:01 +00:00
parent 3ac2ac2e08
commit 9da3dfff9a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=355232
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libexec/rc/rc.d/ldconfig
View File

@ -40,7 +40,9 @@ ldconfig_start()
check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
${ldconfig} -elf ${_ins} ${_LDC}
case `sysctl -n hw.machine_arch` in
machine_arch=$(sysctl -n hw.machine_arch)
case ${machine_arch} in
amd64|mips64|powerpc64)
for i in ${ldconfig_local32_dirs}; do
if [ -d "${i}" ]; then
@ -62,7 +64,7 @@ ldconfig_start()
;;
esac
case `sysctl -n hw.machine_arch` in
case ${machine_arch} in
armv[67])
for i in ${ldconfig_localsoft_dirs}; do
if [ -d "${i}" ]; then
@ -85,7 +87,7 @@ ldconfig_start()
esac
# Legacy aout support for i386 only
case `sysctl -n hw.machine_arch` in
case ${machine_arch} in
i386)
# Default the a.out ldconfig path.
: ${ldconfig_paths_aout=${ldconfig_paths}}