diff options
author | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-05-12 16:45:18 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-05-12 16:45:18 +0200 |
commit | 5efd6f5997018cfe9b00fccf9d9e37276298d253 (patch) | |
tree | 517d575c820a0ae96bb8886b1ce96ece83088462 | |
parent | e1875213606eb8269056d0623e25efbc87aea4fe (diff) | |
download | embtoolkit-5efd6f5997018cfe9b00fccf9d9e37276298d253.tar.gz embtoolkit-5efd6f5997018cfe9b00fccf9d9e37276298d253.tar.bz2 embtoolkit-5efd6f5997018cfe9b00fccf9d9e37276298d253.tar.xz |
Toolchain: remove some gmp versions, give ability to patch mpfr
This patch remove some gmp version in its .kconfig file.
It also gives now the ability to apply patch from mpfr.org.
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
-rw-r--r-- | kconfig/gmphost.kconfig | 12 | ||||
-rw-r--r-- | kconfig/mpfrhost.kconfig | 8 | ||||
-rw-r--r-- | mk/mpfrhost.mk | 10 | ||||
-rw-r--r-- | mk/toolchain.mk | 9 |
4 files changed, 25 insertions, 14 deletions
diff --git a/kconfig/gmphost.kconfig b/kconfig/gmphost.kconfig index 22e752e..46160a9 100644 --- a/kconfig/gmphost.kconfig +++ b/kconfig/gmphost.kconfig @@ -37,20 +37,10 @@ choice bool "gmp-4.3.0" config EMBTK_GMP_HOST_VERSION_4_2_4 bool "gmp-4.2.4" - config EMBTK_GMP_HOST_VERSION_4_2_3 - bool "gmp-4.2.3" - config EMBTK_GMP_HOST_VERSION_4_2_2 - bool "gmp-4.2.2" - config EMBTK_GMP_HOST_VERSION_4_2_1 - bool "gmp-4.2.1" endchoice config EMBTK_GMP_HOST_VERSION_STRING string default "4.3.1" if EMBTK_GMP_HOST_VERSION_4_3_1 -default "4.3.0" if EMBTK_MPFR_HOST_VERSION_4_3_0 +default "4.3.0" if EMBTK_GMP_HOST_VERSION_4_3_0 default "4.2.4" if EMBTK_GMP_HOST_VERSION_4_2_4 -default "4.2.3" if EMBTK_GMP_HOST_VERSION_4_2_3 -default "4.2.2" if EMBTK_GMP_HOST_VERSION_4_2_2 -default "4.2.1" if EMBTK_GMP_HOST_VERSION_4_2_1 - diff --git a/kconfig/mpfrhost.kconfig b/kconfig/mpfrhost.kconfig index 791be26..f36602f 100644 --- a/kconfig/mpfrhost.kconfig +++ b/kconfig/mpfrhost.kconfig @@ -36,8 +36,16 @@ choice bool "mpfr-2.4.0" endchoice +#Version string config EMBTK_MPFR_HOST_VERSION_STRING string default "2.4.1" if EMBTK_MPFR_HOST_VERSION_2_4_1 default "2.4.0" if EMBTK_MPFR_HOST_VERSION_2_4_0 +#Does we need patches? +config EMBTK_MPFR_HOST_VERSION_PATCH + depends on EMBTK_MPFR_HOST_VERSION_2_4_1 || EMBTK_MPFR_HOST_VERSION_2_4_0 + bool + default y + + diff --git a/mk/mpfrhost.mk b/mk/mpfrhost.mk index 63211c5..9e3916b 100644 --- a/mk/mpfrhost.mk +++ b/mk/mpfrhost.mk @@ -39,12 +39,20 @@ $(MPFR_HOST_BUILD_DIR)/.built: download_mpfr_host $(MPFR_HOST_BUILD_DIR)/.decomp $(MPFR_HOST_BUILD_DIR)/.decompressed: @tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(MPFR_HOST_PACKAGE) +ifeq ($(CONFIG_EMBTK_MPFR_HOST_VERSION_PATCH),y) + cd $(TOOLS_BUILD)/mpfr-$(MPFR_HOST_VERSION); patch -p1 < $(DOWNLOAD_DIR)/mpfr-$(MPFR_HOST_VERSION).patch +endif @mkdir -p $(MPFR_HOST_BUILD_DIR) @touch $@ download_mpfr_host: @test -e $(DOWNLOAD_DIR)/$(MPFR_HOST_PACKAGE) || \ - wget -P $(DOWNLOAD_DIR) $(MPFR_HOST_SITE)/$(MPFR_HOST_PACKAGE) + wget $(MPFR_HOST_SITE)/$(MPFR_HOST_PACKAGE) \ + -O $(DOWNLOAD_DIR)/$(MPFR_HOST_PACKAGE) +ifeq ($(CONFIG_EMBTK_MPFR_HOST_VERSION_PATCH),y) + wget $(MPFR_HOST_SITE)/patches \ + -O $(DOWNLOAD_DIR)/mpfr-$(MPFR_HOST_VERSION).patch +endif $(MPFR_HOST_BUILD_DIR)/.configured: @mkdir -p $(MPFR_HOST_DIR) diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 714daa3..7d8537e 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -22,10 +22,15 @@ # \date May 2009 ######################################################################################### - - #GMP on host include $(EMBTK_ROOT)/mk/gmphost.mk #MPFR include $(EMBTK_ROOT)/mk/mpfrhost.mk + +#GCC +include $(EMBTK_ROOT)/mk/gcc.mk + +#targets +buildtoolchain: gmphost_install mpfrhost_install + |