1.1 --- a/scripts/build/libc/uClibc.sh Thu Oct 11 14:39:44 2012 +1000
1.2 +++ b/scripts/build/libc/uClibc.sh Wed Oct 31 23:31:32 2012 +0100
1.3 @@ -10,11 +10,7 @@
1.4 # Download uClibc
1.5 do_libc_get() {
1.6 libc_src="http://www.uclibc.org/downloads
1.7 - http://www.uclibc.org/downloads/snapshots
1.8 http://www.uclibc.org/downloads/old-releases"
1.9 - # For uClibc, we have almost every thing: releases, and snapshots
1.10 - # for the last month or so. We'll have to deal with svn revisions
1.11 - # later...
1.12 if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then
1.13 CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \
1.14 "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}"
1.15 @@ -31,16 +27,14 @@
1.16
1.17 # Extract uClibc
1.18 do_libc_extract() {
1.19 - # If using custom directory location, nothing to do
1.20 - if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
1.21 + # If not using custom directory location, extract and patch
1.22 + # Note: we do the inverse test we do in other components,
1.23 + # because here we still need to extract the locales, even for
1.24 + # custom location directory. Just use negate the whole test,
1.25 + # to keep it the same as for other components.
1.26 + if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
1.27 -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
1.28 - return 0
1.29 - fi
1.30 - CT_Extract "uClibc-${CT_LIBC_VERSION}"
1.31 - # Don't patch snapshots
1.32 - if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
1.33 - -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
1.34 - ]; then
1.35 + CT_Extract "uClibc-${CT_LIBC_VERSION}"
1.36 CT_Patch "uClibc" "${CT_LIBC_VERSION}"
1.37 fi
1.38
1.39 @@ -467,8 +461,6 @@
1.40 fi
1.41
1.42 # Push the threading model
1.43 - # Note: we take into account all of the .28, .29, .30 and .31
1.44 - # versions, here. Even snapshots with NPTL.
1.45 case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
1.46 none:)
1.47 cat <<-ENDSED