From b8aa9402335eae6fa8a7fe1a3dbadd1dc50385a2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 12 Sep 2011 02:37:29 +0200 Subject: libc/uClibc: enable NPTL choice for uClibc >= 0.9.32 Signed-off-by: "Yann E. MORIN" diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index aa2068b..5687eb8 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -19,7 +19,7 @@ choice config LIBC_UCLIBC_V_0_9_32 bool prompt "0.9.32" - select LIBC_UCLIBC_0_9_30_or_later + select LIBC_UCLIBC_0_9_32_or_later config LIBC_UCLIBC_V_0_9_31 bool @@ -91,6 +91,11 @@ config LIBC_VERSION default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3 default "snapshot" if LIBC_UCLIBC_V_snapshot +config LIBC_UCLIBC_0_9_32_or_later + bool + select LIBC_SUPPORT_NPTL + select LIBC_UCLIBC_0_9_30_or_later + config LIBC_UCLIBC_0_9_30_or_later bool select LIBC_UCLIBC_PARALLEL diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index dbd1300..870497b 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -158,10 +158,11 @@ addToolVersion() { ver_M=$(getVersionField "${version}" . 1) ver_m=$(getVersionField "${version}" . 2) ver_p=$(getVersionField "${version}" . 3) - if [ ${ver_M} -ge 1 \ - -o ${ver_M} -eq 0 -a ${ver_m} -ge 10 \ - -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -ge 30 ]; then + if [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 30 \ + -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 31 ]; then SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_30_or_later" + elif [ ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 32 ]; then + SedExpr1="${SedExpr1}\n select LIBC_UCLIBC_0_9_32_or_later" fi ;; gdb) -- cgit v0.10.2-6-g49f6