diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-07-03 00:17:54 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-07-03 00:17:54 +0200 |
| commit | 974f60e98adf71555f685fa69ee649fe28d72d31 (patch) | |
| tree | 48b2d9c30d3e2db3d1925c334bd6f11290a07bce | |
| parent | 3fafacd093dc78a5c328d86e719c388b7e5a062a (diff) | |
| download | crosstool-ng-974f60e98adf71555f685fa69ee649fe28d72d31.tar.gz crosstool-ng-974f60e98adf71555f685fa69ee649fe28d72d31.tar.bz2 crosstool-ng-974f60e98adf71555f685fa69ee649fe28d72d31.zip | |
libc/uClibc: fix snapshots
Snapshots are in a subdir named uClibc, not uClibc-snapshot
(or uClibc-YYYYMMDD either).
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index e10f3eca..ba5dbf10 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -19,14 +19,29 @@ do_libc_get() { return 0 } +libc_uclibc_src_dir() { + if [ -z "${CT_LIBC_V_snapshot}" \ + -a -z "${CT_LIBC_V_specific_date}" \ + ]; then + echo "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" + else + echo "${CT_SRC_DIR}/uClibc" + fi +} + # Extract uClibc do_libc_extract() { CT_Extract "uClibc-${CT_LIBC_VERSION}" - CT_Patch "uClibc" "${CT_LIBC_VERSION}" + # Don't patch snapshots + if [ -z "${CT_LIBC_V_snapshot}" \ + -a -z "${CT_LIBC_V_specific_date}" \ + ]; then + CT_Patch "uClibc" "${CT_LIBC_VERSION}" + fi # uClibc locales if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then - CT_Pushd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}/extra/locale" + CT_Pushd "$(libc_uclibc_src_dir)/extra/locale" CT_Extract nochdir "uClibc-locale-030818" CT_Patch nochdir "uClibc" "locale-030818" CT_Popd @@ -60,7 +75,7 @@ do_libc_headers() { # Simply copy files until uClibc has the ability to build out-of-tree CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \ + CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \ "${CT_BUILD_DIR}/build-libc-headers" cd "${CT_BUILD_DIR}/build-libc-headers" @@ -100,7 +115,7 @@ do_libc() { # Simply copy files until uClibc has the ability to build out-of-tree CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" \ + CT_DoExecLog ALL cp -av "$(libc_uclibc_src_dir)" \ "${CT_BUILD_DIR}/build-libc" cd "${CT_BUILD_DIR}/build-libc" |