From a6337a4dc81de8a9428860365a11a392baca323f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 6 Dec 2010 16:40:09 -0300 Subject: mpfr: make it a proper package and bump to version 3.0.0-p8 * Convert mpfr to a proper autotargets package * Bump to version 3.0.0-p8 * Hook it up for binutils/gcc to use Signed-off-by: Gustavo Zacarias Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/binutils/binutils.mk | 10 +++++----- toolchain/gcc/gcc-uclibc-4.x.mk | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 327a0f65d..c33259057 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -16,16 +16,16 @@ endif BINUTILS_HOST_PREREQ:= BINUTILS_TARGET_PREREQ:= -BINUTILS_HOST_PREREQ:=host-gmp $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) -HOST_SOURCE += host-gmp-source host-libmpfr-source +BINUTILS_HOST_PREREQ:=host-gmp host-mpfr +HOST_SOURCE += host-gmp-source host-mpfr-source -BINUTILS_TARGET_PREREQ:=gmp $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) +BINUTILS_TARGET_PREREQ:=gmp mpfr EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-gmp=$(HOST_DIR)/usr -EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_HOST_DIR)" +EXTRA_BINUTILS_CONFIG_OPTIONS+=--with-mpfr=$(HOST_DIR)/usr BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp=$(STAGING_DIR)/usr -BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)" +BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_LIBMPC),y) BINUTILS_ADD_MPC = y diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 13961bb75..f454be84a 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -107,8 +107,8 @@ GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc endif GCC_WITH_HOST_GMP = --with-gmp=$(HOST_DIR)/usr -GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) -HOST_SOURCE += host-gmp-source host-libmpfr-source +GCC_WITH_HOST_MPFR = --with-mpfr=$(HOST_DIR)/usr +HOST_SOURCE += host-gmp-source host-mpfr-source ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) GCC_WITH_HOST_MPC=--with-mpc=$(MPC_HOST_DIR) @@ -120,7 +120,7 @@ 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=$(STAGING_DIR)/usr -GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)" +GCC_WITH_TARGET_MPFR = --with-mpfr=$(STAGING_DIR)/usr ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.) GCC_WITH_TARGET_MPC=--with-mpc="$(MPC_TARGET_DIR)" endif -- cgit v1.2.3