# HG changeset patch # User "Yann E. MORIN" # Date 1399823493 -7200 # Node ID 6b2c4692f132890ead397f53efdbc5b6bd7bf3cd # Parent 42590ff8521c40b38f9cb37983a9be826492b3a1 binutils/elf2flt: restore the custom location functionality Somehow, it got lost when incorporating elf2flt in the binutils farmework. Signed-off-by: "Yann E. MORIN" diff -r 42590ff8521c -r 6b2c4692f132 scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh Sun May 11 18:42:30 2014 +0200 +++ b/scripts/build/binutils/binutils.sh Sun May 11 17:51:33 2014 +0200 @@ -14,7 +14,12 @@ fi if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git + if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then + CT_GetCustom "elf2flt" "${CT_ELF2FLT_VERSION}" \ + "${CT_ELF2FLT_CUSTOM_LOCATION}" + else + CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git + fi fi } @@ -28,8 +33,11 @@ fi if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}" - CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}" + if ! [ "${CT_ELF2FLT_CUSTOM}" = "y" \ + -a -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then + CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}" + CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}" + fi fi }