summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-10-11 08:56:29 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-10-11 08:56:29 +0200
commit3e8e0fbc88bd2eae7a1fd144d37027c5c254f835 (patch)
treeaaf72096d87bf5b576f187afd2efaf2e55f96dd2
parent6f2064e7099a359752c9d3c8a678bc6026b423fb (diff)
downloadembtoolkit-3e8e0fbc88bd2eae7a1fd144d37027c5c254f835.tar.gz
embtoolkit-3e8e0fbc88bd2eae7a1fd144d37027c5c254f835.tar.bz2
embtoolkit-3e8e0fbc88bd2eae7a1fd144d37027c5c254f835.tar.xz
Toolchain: binutils: add v2.24 and drop 2.22
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/toolchain/binutils/binutils.kconfig21
-rw-r--r--core/toolchain/binutils/binutils.mk4
2 files changed, 12 insertions, 13 deletions
diff --git a/core/toolchain/binutils/binutils.kconfig b/core/toolchain/binutils/binutils.kconfig
index 63b934a..ad12765 100644
--- a/core/toolchain/binutils/binutils.kconfig
+++ b/core/toolchain/binutils/binutils.kconfig
@@ -31,21 +31,20 @@ choice
prompt "Version of binutils you wish"
depends on EMBTK_HAVE_BINUTILS
help
- Here you can choose which version of binutils your toochain
- will use.
+ Here you can choose which version of binutils your toochain will use.
+ config EMBTK_BINUTILS_VERSION_2_24
+ bool "binutils-2.24"
+ select EMBTK_BINUTILS_NEED_PATCH
config EMBTK_BINUTILS_VERSION_2_23_2
bool "binutils-2.23.2"
select EMBTK_BINUTILS_NEED_PATCH
- config EMBTK_BINUTILS_VERSION_2_22
- bool "binutils-2.22"
- select EMBTK_BINUTILS_NEED_PATCH
config EMBTK_BINUTILS_VERSION_GIT
bool "Use binutils git repository"
help
- Answer Y here if you want to build your toolchain based
- on binutils sources from its GIT repository.
- See http://sourceware.org/git/?p=binutils.git
+ Answer Y here if you want to build your toolchain based on
+ binutils sources from its GIT repository.
+ See http://sourceware.org/git/?p=binutils-gdb.git
endchoice
#
@@ -56,13 +55,13 @@ config EMBTK_BINUTILS_GIT_BRANCH
default "master"
depends on EMBTK_BINUTILS_VERSION_GIT
help
- The branch of the git repository to use, the default is master.
+ The branch of the git repository to use, the default is master.
config EMBTK_BINUTILS_GIT_REVISION
string "Checkout a specific revision instead of the latest"
depends on EMBTK_BINUTILS_VERSION_GIT
help
- Chechout a specific revision instead of the latest.
+ Chechout a specific revision instead of the latest.
config EMBTK_BINUTILS_REFSPEC
string
@@ -73,8 +72,8 @@ config EMBTK_BINUTILS_REFSPEC
#
config EMBTK_BINUTILS_VERSION_STRING
string
+ default "2.24" if EMBTK_BINUTILS_VERSION_2_24
default "2.23.2" if EMBTK_BINUTILS_VERSION_2_23_2
- default "2.22" if EMBTK_BINUTILS_VERSION_2_22
config EMBTK_BINUTILS_NEED_PATCH
bool
diff --git a/core/toolchain/binutils/binutils.mk b/core/toolchain/binutils/binutils.mk
index 1d6e4a5..7c282ef 100644
--- a/core/toolchain/binutils/binutils.mk
+++ b/core/toolchain/binutils/binutils.mk
@@ -24,12 +24,12 @@
################################################################################
BINUTILS_NAME := binutils
-BINUTILS_VERSION := $(call embtk_get_pkgversion,binutils)
+BINUTILS_VERSION := $(call embtk_pkg_version,binutils)
BINUTILS_SITE := http://ftp.gnu.org/gnu/binutils
BINUTILS_GIT_SITE := git://sourceware.org/git/binutils.git
BINUTILS_PACKAGE := binutils-$(BINUTILS_VERSION).tar.bz2
BINUTILS_SRC_DIR := $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)
-BINUTILS_BUILD_DIR := $(embtk_toolsb)/binutils-build
+BINUTILS_BUILD_DIR := $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)-build
BINUTILS_KEEP_SRC_DIR := $(embtk_toolchain_has_llvm-y)