1.1 --- a/scripts/build/libc/uClibc.sh Sun Apr 24 18:57:01 2011 +0200
1.2 +++ b/scripts/build/libc/uClibc.sh Wed Aug 03 00:00:44 2011 +0200
1.3 @@ -24,16 +24,6 @@
1.4 return 0
1.5 }
1.6
1.7 -libc_uclibc_src_dir() {
1.8 - if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
1.9 - -a -z "${CT_LIBC_UCLIBC_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 @@ -49,7 +39,7 @@
1.21 # broken, so just link it in place...
1.22 if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" \
1.23 -a ! -f "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted" ]; then
1.24 - CT_Pushd "$(libc_uclibc_src_dir)/extra/locale"
1.25 + CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale"
1.26 CT_DoExecLog ALL ln -s "${CT_TARBALLS_DIR}/${uclibc_local_tarball}.tgz" .
1.27 CT_Popd
1.28 touch "${CT_SRC_DIR}/.${uclibc_local_tarball}.extracted"
1.29 @@ -84,7 +74,7 @@
1.30
1.31 # Simply copy files until uClibc has the ability to build out-of-tree
1.32 CT_DoLog EXTRA "Copying sources to build dir"
1.33 - CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \
1.34 + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
1.35 "${CT_BUILD_DIR}/build-libc-headers"
1.36 cd "${CT_BUILD_DIR}/build-libc-headers"
1.37
1.38 @@ -170,7 +160,7 @@
1.39
1.40 # Simply copy files until uClibc has the ability to build out-of-tree
1.41 CT_DoLog EXTRA "Copying sources to build dir"
1.42 - CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \
1.43 + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \
1.44 "${CT_BUILD_DIR}/build-libc"
1.45 cd "${CT_BUILD_DIR}/build-libc"
1.46