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

binutils/binutils: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom

Browse Source 
CUSTOM_LOCATION config options only presented in menuconfig if component
CUSTOM version selected.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>
[yann.morin.1998@free.fr: fix indentation, don't patch custom dir location]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <7a604b5df9c84a1e20c3.1349931195@localhost.localdomain>
PatchWork-Id: 190788
This commit is contained in:
David Holsgrove 2012-10-11 14:39:41 +10:00
parent 6b8740dd6d
commit 2ace8ed697
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/binutils/binutils.in
View File

@ -50,8 +50,26 @@ config BINUTILS_V_2_16_1a
prompt "2.16.1a (OBSOLETE)" prompt "2.16.1a (OBSOLETE)"
depends on OBSOLETE depends on OBSOLETE
config BINUTILS_CUSTOM
bool
prompt "Custom binutils"
depends on EXPERIMENTAL
select BINUTILS_2_22_or_later
endchoice endchoice
if BINUTILS_CUSTOM
config BINUTILS_CUSTOM_LOCATION
string
prompt "Full path to custom binutils source"
default ""
help
Enter the path to the directory (or tarball) of your source for binutils,
or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/binutils
endif # BINUTILS_CUSTOM
config BINUTILS_VERSION config BINUTILS_VERSION
string string
# Don't remove next line # Don't remove next line
@ -64,6 +82,7 @@ config BINUTILS_VERSION
default "2.18a" if BINUTILS_V_2_18a default "2.18a" if BINUTILS_V_2_18a
default "2.17a" if BINUTILS_V_2_17a default "2.17a" if BINUTILS_V_2_17a
default "2.16.1a" if BINUTILS_V_2_16_1a default "2.16.1a" if BINUTILS_V_2_16_1a
default "custom" if BINUTILS_CUSTOM
config BINUTILS_2_22_or_later config BINUTILS_2_22_or_later
bool bool

17
scripts/build/binutils/binutils.sh
View File

@ -4,13 +4,24 @@
# Download binutils # Download binutils
do_binutils_get() { do_binutils_get() {
CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ if [ "${CT_BINUTILS_CUSTOM}" = "y" ]; then
{ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ CT_GetCustom "binutils" "${CT_BINUTILS_VERSION}" \
ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} "${CT_BINUTILS_CUSTOM_LOCATION}"
else
CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \
{ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \
ftp://gcc.gnu.org/pub/binutils/{releases,snapshots}
fi
} }
# Extract binutils # Extract binutils
do_binutils_extract() { do_binutils_extract() {
# If using custom directory location, nothing to do
if [ "${CT_BINUTILS_CUSTOM}" = "y" \
-a -d "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}" ]; then
return 0
fi
CT_Extract "binutils-${CT_BINUTILS_VERSION}" CT_Extract "binutils-${CT_BINUTILS_VERSION}"
CT_Patch "binutils" "${CT_BINUTILS_VERSION}" CT_Patch "binutils" "${CT_BINUTILS_VERSION}"
} }