summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2014-12-09 05:45:45 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2014-12-09 05:45:45 (GMT)
commit6df76e2c3e5e9fe93a4e47e4f5f64554b8fde07d (patch)
tree4d214b29ab0fdd1cabaa7d16d4f3cc3c2b5d39bd
parent79422633cf2d0282ed2d637d2ba237cc3f4e6a8e (diff)
parentd7b4f0dbe3d6a17cc736fb4879c241890f4d73b7 (diff)
Merge pull request #5 from davidholsgrove/glibc2.20_updates
Glibc 2.20 updates
-rw-r--r--config/libc/glibc.in9
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common10
2 files changed, 15 insertions, 4 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 2e34793..d349dfb 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -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
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 4d961fd..af3b1f1 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}\$//;"