diff -r 79169596cfc9 -r fb71cad4b085 scripts/build/libc/uClibc.sh --- a/scripts/build/libc/uClibc.sh Thu Oct 11 14:39:44 2012 +1000 +++ b/scripts/build/libc/uClibc.sh Thu Jan 10 00:27:13 2013 +0100 @@ -10,11 +10,7 @@ # Download uClibc do_libc_get() { libc_src="http://www.uclibc.org/downloads - http://www.uclibc.org/downloads/snapshots http://www.uclibc.org/downloads/old-releases" - # For uClibc, we have almost every thing: releases, and snapshots - # for the last month or so. We'll have to deal with svn revisions - # later... if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \ "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}" @@ -31,16 +27,14 @@ # Extract uClibc do_libc_extract() { - # If using custom directory location, nothing to do - if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \ + # If not using custom directory location, extract and patch + # Note: we do the inverse test we do in other components, + # because here we still need to extract the locales, even for + # custom location directory. Just use negate the whole test, + # to keep it the same as for other components. + if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \ -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then - return 0 - fi - CT_Extract "uClibc-${CT_LIBC_VERSION}" - # Don't patch snapshots - if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \ - -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \ - ]; then + CT_Extract "uClibc-${CT_LIBC_VERSION}" CT_Patch "uClibc" "${CT_LIBC_VERSION}" fi @@ -467,8 +461,6 @@ fi # Push the threading model - # Note: we take into account all of the .28, .29, .30 and .31 - # versions, here. Even snapshots with NPTL. case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in none:) cat <<-ENDSED