From 163a1737b8464ae241c0bfc1dfe61bbc668b3428 Mon Sep 17 00:00:00 2001 From: David Holsgrove Date: Tue, 12 Mar 2013 15:13:34 +1000 Subject: libc/{,e}glibc: If using custom {e}glibc, dont extract or patch If custom {e}glibc is being used, no need to carry out the extract or patching phase of scripts/build/libc/glibc-eglibc.sh-common Signed-off-by: David Holsgrove diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index af3b1f1..367a80d 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -4,10 +4,16 @@ do_libc_extract() { local addon - # Extract the main tarball - CT_Extract "${CT_LIBC}-${CT_LIBC_VERSION}" + # Attempt CT_EXTRACT only if NOT custom, or CUSTOM_LOCATION is not a directory + if [ "${CT_LIBC_CUSTOM}" != "y" \ + -o ! -d "${CT_LIBC_CUSTOM_LOCATION}" ]; then + CT_Extract "${CT_LIBC}-${CT_LIBC_VERSION}" + fi CT_Pushd "${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" - CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}" + # Attempt CT_PATCH only if NOT custom + if [ "${CT_LIBC_CUSTOM}" != "y" ]; then + CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}" + fi # Extract the add-opns for addon in $(do_libc_add_ons_list " "); do -- cgit v0.10.2-6-g49f6