ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-12 05:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/uClibc: fix snapshots

Browse Source 
Snapshots are in a subdir named uClibc, not uClibc-snapshot
(or uClibc-YYYYMMDD either).
(transplanted from b13d0db6fa95795bb663bf674372b58221682dd6)
This commit is contained in:
Yann E. MORIN" 2010-07-03 00:17:54 +02:00
parent 1e2788c044
commit 611b74e36a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/build/libc/uClibc.sh
View File

@ -19,14 +19,29 @@ do_libc_get() {
return 0 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 # Extract uClibc
do_libc_extract() { do_libc_extract() {
CT_Extract "uClibc-${CT_LIBC_VERSION}" CT_Extract "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}" CT_Patch "uClibc" "${CT_LIBC_VERSION}"
fi
# uClibc locales # uClibc locales
if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then 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_Extract nochdir "uClibc-locale-030818"
CT_Patch nochdir "uClibc" "locale-030818" CT_Patch nochdir "uClibc" "locale-030818"
CT_Popd CT_Popd
@ -60,7 +75,7 @@ do_libc_headers() {
# Simply copy files until uClibc has the ability to build out-of-tree # Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir" 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" "${CT_BUILD_DIR}/build-libc-headers"
cd "${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 # Simply copy files until uClibc has the ability to build out-of-tree
CT_DoLog EXTRA "Copying sources to build dir" 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" "${CT_BUILD_DIR}/build-libc"
cd "${CT_BUILD_DIR}/build-libc" cd "${CT_BUILD_DIR}/build-libc"