summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-01-22 21:35:18 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-01-22 21:35:18 (GMT)
commitb343b0216b476129b1117f20d1f642b6d86e358f (patch)
treeb235a680fd629d4187cddc56bec67567b0aa4699
parenta150a97e4468caf1ef6167ee3a61b8fbaaac35d8 (diff)
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" <yann.morin.1998@anciens.enib.fr>
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common8
-rw-r--r--scripts/build/libc/glibc.sh13
2 files changed, 5 insertions, 16 deletions
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 75521cc..50cd450 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
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index d06a9a1..b079e6f 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -263,16 +263,3 @@ do_libc() {
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}\$//;"
-}