ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-18 18:56:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from davidholsgrove/glibc2.20_updates

Browse Source 
Glibc 2.20 updates
This commit is contained in:
Bryan Hundven 2014-12-08 21:45:45 -08:00
commit 6df76e2c3e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/libc/glibc.in
View File

@ -17,6 +17,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
config LIBC_GLIBC_V_2_20
bool
prompt "2.20"
select LIBC_GLIBC_2_20_or_later
config LIBC_GLIBC_V_2_19
bool
prompt "2.19"
@ -92,10 +97,14 @@ config LIBC_GLIBC_V_2_8
endchoice
config LIBC_GLIBC_2_20_or_later
bool
config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "2.20" if LIBC_GLIBC_V_2_20
default "2.19" if LIBC_GLIBC_V_2_19
default "2.18" if LIBC_GLIBC_V_2_18
default "2.17" if LIBC_GLIBC_V_2_17

10
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}" \
|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}\$//;"