ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-23 14:42:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

glibc: nptl is default from 2.20, so dont add to addons_list

Browse Source 
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 <david.holsgrove@xilinx.com>
This commit is contained in:
David Holsgrove 2014-12-09 13:58:12 +10:00
parent f1bdbe995b
commit d7b4f0dbe3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/libc/glibc.in
View File

@ -20,6 +20,7 @@ choice
config LIBC_GLIBC_V_2_20 config LIBC_GLIBC_V_2_20
bool bool
prompt "2.20" prompt "2.20"
select LIBC_GLIBC_2_20_or_later
config LIBC_GLIBC_V_2_19 config LIBC_GLIBC_V_2_19
bool bool
@ -96,6 +97,9 @@ config LIBC_GLIBC_V_2_8
endchoice endchoice
config LIBC_GLIBC_2_20_or_later
bool
config LIBC_VERSION config LIBC_VERSION
string string
# Don't remove next line # Don't remove next line

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

@ -487,10 +487,12 @@ do_libc_add_ons_list() {
local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}" \ local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}" \
|sed -r -e "s/[[:space:],]/${sep}/g;" \ |sed -r -e "s/[[:space:],]/${sep}/g;" \
)" )"
if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then
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
fi
[ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
# Remove duplicate, leading and trailing separators # Remove duplicate, leading and trailing separators
echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;" echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"