From b343b0216b476129b1117f20d1f642b6d86e358f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 22 Jan 2011 22:35:18 +0100 Subject: libc/glibc: commonalise assembling the list of addons 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" --- scripts/build/libc/glibc-eglibc.sh-common | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts/build/libc/glibc-eglibc.sh-common') diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index 75521ccd..50cd4505 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -243,14 +243,16 @@ do_libc_finish() { # Build up the addons list, separated with $1 do_libc_add_ons_list() { 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 none) ;; *) addons_list="${addons_list}${sep}${CT_THREADS}";; esac [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" - addons_list="${addons_list%%${sep}}" - echo "${addons_list##${sep}}" + # Remove duplicate, leading and trailing separators + echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;" } # Compute up the minimum supported Linux kernel version -- cgit v1.2.3