ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-22 17:42:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/glibc: commonalise assembling the list of addons

Browse Source 
glibc and eglibc each have two very similar ways of building this list.
This can, and should definitetly, be shared.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2011-01-22 22:35:18 +01:00
parent a150a97e44
commit b343b0216b
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/libc/glibc-eglibc.sh-common
View File

@ -243,14 +243,16 @@ do_libc_finish() {
# Build up the addons list, separated with $1 # Build up the addons list, separated with $1
do_libc_add_ons_list() { do_libc_add_ons_list() {
local sep="$1" local sep="$1"
local addons_list=$(echo "${CT_LIBC_ADDONS_LIST//,/${sep}}" |tr -s ,) local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}" \
|sed -r -e "s/[[:space:],]/${sep}/g;" \
)"
case "${CT_THREADS}" in case "${CT_THREADS}" in
none) ;; none) ;;
*) addons_list="${addons_list}${sep}${CT_THREADS}";; *) addons_list="${addons_list}${sep}${CT_THREADS}";;
esac esac
[ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
addons_list="${addons_list%%${sep}}" # Remove duplicate, leading and trailing separators
echo "${addons_list##${sep}}" echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"
} }
# Compute up the minimum supported Linux kernel version # Compute up the minimum supported Linux kernel version

13
scripts/build/libc/glibc.sh
View File

@ -263,16 +263,3 @@ do_libc() {
CT_EndStep CT_EndStep
} }
# Build up the addons list, separated with $1
do_libc_add_ons_list() {
local sep="$1"
local addons_list=$(echo "${CT_LIBC_ADDONS_LIST}" |sed -r -e "s/[ ,]/${sep}/g;")
case "${CT_THREADS}" in
none) ;;
*) addons_list="${addons_list}${sep}${CT_THREADS}";;
esac
[ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
# Remove duplicate, leading and trailing separators
echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"
}