mirror of
https://github.com/opnsense/src.git
synced 2026-06-09 00:32:25 -04:00
Sync with 2.13. Reduce forking by using multiple sed expressions rather
than piping thru tr(1). Also prefer case over for+test, as case will handle regex's nicely. Note we can't exactly follow the real 2.13 genscripts.sh as we wind up with multiple "'s in search paths. It is too late tonight to track down why.
This commit is contained in:
parent
87d59d4d4b
commit
71cd0da063
1 changed files with 6 additions and 4 deletions
|
|
@ -43,7 +43,8 @@ fi
|
|||
# The format is the usual list of colon-separated directories.
|
||||
# To force a logically empty LIB_PATH, do LIBPATH=":".
|
||||
|
||||
LIB_SEARCH_DIRS=`echo ${libdir} | tr ':' ' ' | sed -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\1);/g'`
|
||||
LIB_SEARCH_DIRS=`echo ${libdir} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\1);/g'`
|
||||
#2.13 LIB_SEARCH_DIRS=`echo ${libdir} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`
|
||||
|
||||
# Generate 5 or 6 script files from a master script template in
|
||||
# ${srcdir}/scripttempl/${SCRIPT_NAME}.sh. Which one of the 5 or 6
|
||||
|
|
@ -155,8 +156,9 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
for i in $EMULATION_LIBPATH ; do
|
||||
test "$i" = "$EMULATION_NAME" && COMPILE_IN=true
|
||||
done
|
||||
case " $EMULATION_LIBPATH " in
|
||||
*" ${EMULATION_NAME} "*) COMPILE_IN=true;;
|
||||
esac
|
||||
|
||||
# Generate e${EMULATION_NAME}.c.
|
||||
. ${srcdir}/emultempl/${TEMPLATE_NAME-generic}.em
|
||||
|
|
|
|||
Loading…
Reference in a new issue