summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-06 00:39:15 +0100
committerAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-06 00:39:15 +0100
commitf02760f428cb67e0906153da9977466feca3234b (patch)
treecefc5961801bf669cf54215c466e4df83fbb8f3e
parentc270ecde682d618cbe386589c07805292f95ad18 (diff)
downloadembtoolkit-f02760f428cb67e0906153da9977466feca3234b.tar.gz
embtoolkit-f02760f428cb67e0906153da9977466feca3234b.tar.bz2
embtoolkit-f02760f428cb67e0906153da9977466feca3234b.tar.xz
Toolchain: mpfr: introduce build of 2.4.2 and rework build process
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
-rw-r--r--kconfig/mpfrhost.kconfig17
-rw-r--r--mk/mpfrhost.mk3
2 files changed, 11 insertions, 9 deletions
diff --git a/kconfig/mpfrhost.kconfig b/kconfig/mpfrhost.kconfig
index 8c8d347..90d8037 100644
--- a/kconfig/mpfrhost.kconfig
+++ b/kconfig/mpfrhost.kconfig
@@ -24,29 +24,30 @@
choice
prompt "Version of mpfr you wish"
- default EMBTK_MPFR_HOST_VERSION_2_4_1
+ default EMBTK_MPFR_HOST_VERSION_2_4_2
help
The MPFR library is a C library for multiple-precision
floating-point computations with correct rounding.
MPFR is mandatory to build GCC
+ config EMBTK_MPFR_HOST_VERSION_2_4_2
+ bool "mpfr-2.4.2"
config EMBTK_MPFR_HOST_VERSION_2_4_1
bool "mpfr-2.4.1"
+ select EMBTK_MPFR_HOST_VERSION_PATCH
config EMBTK_MPFR_HOST_VERSION_2_4_0
bool "mpfr-2.4.0"
+ select EMBTK_MPFR_HOST_VERSION_PATCH
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
+ string
+ default "2.4.2" if EMBTK_MPFR_HOST_VERSION_2_4_2
+ 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 b5b3c9a..0c9d1e9 100644
--- a/mk/mpfrhost.mk
+++ b/mk/mpfrhost.mk
@@ -24,6 +24,7 @@
MPFR_HOST_VERSION:=$(subst ",,$(strip $(CONFIG_EMBTK_MPFR_HOST_VERSION_STRING)))
MPFR_HOST_SITE := http://www.mpfr.org/mpfr-$(MPFR_HOST_VERSION)
+MPFR_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/mpfr
MPFR_HOST_PACKAGE := mpfr-$(MPFR_HOST_VERSION).tar.bz2
MPFR_HOST_BUILD_DIR := $(TOOLS_BUILD)/mpfr
MPFR_HOST_DIR := $(HOSTTOOLS)/usr/local/mpfr-host
@@ -52,7 +53,7 @@ download_mpfr_host:
-O $(DOWNLOAD_DIR)/$(MPFR_HOST_PACKAGE)
ifeq ($(CONFIG_EMBTK_MPFR_HOST_VERSION_PATCH),y)
@test -e $(DOWNLOAD_DIR)/mpfr-$(MPFR_HOST_VERSION).patch || \
- wget $(MPFR_HOST_SITE)/patches \
+ wget $(MPFR_PATCH_SITE)/mpfr-$(MPFR_HOST_VERSION)-*.patch \
-O $(DOWNLOAD_DIR)/mpfr-$(MPFR_HOST_VERSION).patch
endif