1.1 --- a/scripts/build/libc/uClibc.sh	Wed Jul 07 22:33:49 2010 +0200
     1.2 +++ b/scripts/build/libc/uClibc.sh	Sat Jul 03 00:17:54 2010 +0200
     1.3 @@ -19,14 +19,29 @@
     1.4      return 0
     1.5  }
     1.6  
     1.7 +libc_uclibc_src_dir() {
     1.8 +    if [    -z "${CT_LIBC_V_snapshot}"      \
     1.9 +         -a -z "${CT_LIBC_V_specific_date}" \
    1.10 +       ]; then
    1.11 +        echo "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
    1.12 +    else
    1.13 +        echo "${CT_SRC_DIR}/uClibc"
    1.14 +    fi
    1.15 +}
    1.16 +
    1.17  # Extract uClibc
    1.18  do_libc_extract() {
    1.19      CT_Extract "uClibc-${CT_LIBC_VERSION}"
    1.20 -    CT_Patch "uClibc" "${CT_LIBC_VERSION}"
    1.21 +    # Don't patch snapshots
    1.22 +    if [    -z "${CT_LIBC_V_snapshot}"      \
    1.23 +         -a -z "${CT_LIBC_V_specific_date}" \
    1.24 +       ]; then
    1.25 +        CT_Patch "uClibc" "${CT_LIBC_VERSION}"
    1.26 +    fi
    1.27  
    1.28      # uClibc locales
    1.29      if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
    1.30 -        CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
    1.31 +        CT_Pushd "$(libc_uclibc_src_dir)/extra/locale"
    1.32          CT_Extract nochdir "uClibc-locale-030818"
    1.33          CT_Patch nochdir "uClibc" "locale-030818"
    1.34          CT_Popd
    1.35 @@ -60,7 +75,7 @@
    1.36  
    1.37      # Simply copy files until uClibc has the ability to build out-of-tree
    1.38      CT_DoLog EXTRA "Copying sources to build dir"
    1.39 -    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"   \
    1.40 +    CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)"            \
    1.41                              "${CT_BUILD_DIR}/build-libc-headers"
    1.42      cd "${CT_BUILD_DIR}/build-libc-headers"
    1.43  
    1.44 @@ -100,7 +115,7 @@
    1.45  
    1.46      # Simply copy files until uClibc has the ability to build out-of-tree
    1.47      CT_DoLog EXTRA "Copying sources to build dir"
    1.48 -    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"   \
    1.49 +    CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)"    \
    1.50                              "${CT_BUILD_DIR}/build-libc"
    1.51      cd "${CT_BUILD_DIR}/build-libc"
    1.52