1.1 --- a/scripts/build/binutils/elf2flt.sh Sun Jul 24 23:52:28 2011 +0200
1.2 +++ b/scripts/build/binutils/elf2flt.sh Thu Oct 11 14:39:42 2012 +1000
1.3 @@ -13,17 +13,27 @@
1.4
1.5 # Download elf2flt
1.6 do_elf2flt_get() {
1.7 - CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}" \
1.8 - ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \
1.9 - "elf2flt" \
1.10 - "" \
1.11 - "elf2flt-cvs-${CT_ELF2FLT_VERSION}"
1.12 + if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then
1.13 + CT_GetCustom "elf2flt" "${ELF2FLT_VERSION}" \
1.14 + "${CT_ELF2FLT_CUSTOM_LOCATION}"
1.15 + else
1.16 + CT_GetCVS "elf2flt-${CT_ELF2FLT_VERSION}" \
1.17 + ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \
1.18 + "elf2flt" \
1.19 + "" \
1.20 + "elf2flt-${CT_ELF2FLT_VERSION}"
1.21 + fi
1.22 }
1.23
1.24 # Extract elf2flt
1.25 do_elf2flt_extract() {
1.26 - CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}"
1.27 - CT_Patch "elf2flt-cvs" "${CT_ELF2FLT_VERSION}"
1.28 + # If using custom directory location, nothing to do
1.29 + if [ "${CT_ELF2FLT_CUSTOM}" = "y" \
1.30 + -a -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then
1.31 + return 0
1.32 + fi
1.33 + CT_Extract "elf2flt-${CT_ELF2FLT_VERSION}"
1.34 + CT_Patch "elf2flt" "${CT_ELF2FLT_VERSION}"
1.35 }
1.36
1.37 # Build elf2flt for build -> target
1.38 @@ -111,7 +121,7 @@
1.39 CT_DoLog EXTRA "Configuring elf2flt"
1.40 CT_DoExecLog CFG \
1.41 CFLAGS="${host_cflags}" \
1.42 - "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \
1.43 + "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}/configure" \
1.44 --build=${CT_BUILD} \
1.45 --host=${host} \
1.46 --target=${CT_TARGET} \