diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2010-12-06 16:40:07 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-12-27 22:00:59 +0100 |
| commit | 21f7b8bccec20702170d89ab662757945d9ffbe9 (patch) | |
| tree | 52d3d22344482e2b49cc66df2c178cea036c30df /toolchain | |
| parent | 6908149bec720e6bb4c2d1e8d03331bcd4e3343b (diff) | |
| download | buildroot-novena-21f7b8bccec20702170d89ab662757945d9ffbe9.tar.gz buildroot-novena-21f7b8bccec20702170d89ab662757945d9ffbe9.zip | |
gmp: make it a proper package and bump to version 5.0.1
* Convert gmp to a proper autotargets package
* Bump to version 5.0.1
* Hook it up for binutils/gcc to use
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/binutils.mk | 12 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index ef9f64404..327a0f65d 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -16,17 +16,15 @@ endif BINUTILS_HOST_PREREQ:= BINUTILS_TARGET_PREREQ:= -BINUTILS_HOST_PREREQ:=$(TOOLCHAIN_DIR)/gmp/lib/libgmp$(HOST_LIBEXT) \ - $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) -HOST_SOURCE += host-libgmp-source host-libmpfr-source +BINUTILS_HOST_PREREQ:=host-gmp $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) +HOST_SOURCE += host-gmp-source host-libmpfr-source -BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) \ - $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) +BINUTILS_TARGET_PREREQ:=gmp $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) -EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp="$(GMP_HOST_DIR)" +EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp=$(HOST_DIR)/usr EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)" -BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)" +BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp=$(STAGING_DIR)/usr BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)" ifeq ($(BR2_PACKAGE_LIBMPC),y) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index cd63992fc..13961bb75 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -106,9 +106,9 @@ ifeq ($(BR2_INSTALL_OBJC),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc endif -GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR) +GCC_WITH_HOST_GMP = --with-gmp=$(HOST_DIR)/usr GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) -HOST_SOURCE += host-libgmp-source host-libmpfr-source +HOST_SOURCE += host-gmp-source host-libmpfr-source ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) GCC_WITH_HOST_MPC=--with-mpc=$(MPC_HOST_DIR) @@ -119,7 +119,7 @@ ifeq ($(BR2_INSTALL_FORTRAN),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran #GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so #GCC_STAGING_PREREQ+=$(TOOLCHAIN_DIR)/mpfr/lib/libmpfr.so -GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)" +GCC_WITH_TARGET_GMP = --with-gmp=$(STAGING_DIR)/usr GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)" ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) GCC_WITH_TARGET_MPC=--with-mpc="$(MPC_TARGET_DIR)" |