From d7b4f0dbe3d6a17cc736fb4879c241890f4d73b7 Mon Sep 17 00:00:00 2001 From: David Holsgrove Date: Tue, 9 Dec 2014 13:58:12 +1000 Subject: glibc: nptl is default from 2.20, so dont add to addons_list No longer recommended practice to use --enable-add-ons=nptl, so for 2.20 and later (along with custom glibc), don't add the CT_THREADS to the addons_list https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes Signed-off-by: David Holsgrove --- scripts/build/libc/glibc-eglibc.sh-common | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/build/libc') diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index 4d961fd2..af3b1f14 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -487,10 +487,12 @@ do_libc_add_ons_list() { 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 + if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then + case "${CT_THREADS}" in + none) ;; + *) addons_list="${addons_list}${sep}${CT_THREADS}";; + esac + fi [ "${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}\$//;" -- cgit v1.2.3