Toolchain: move gmp, mpfr and gmp under host tools

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

10 files changed, 37 insertions, 51 deletions

diff --git a/core/toolchain/gcc/gcc.mk b/core/toolchain/gcc/gcc.mk
index 1ca6145..b373c8d 100644
--- a/core/toolchain/gcc/gcc.mk
+++ b/core/toolchain/gcc/gcc.mk
@@ -31,6 +31,7 @@ GCC_PACKAGE	:= gcc-$(GCC_VERSION).tar.bz2
 GCC_SRC_DIR	:= $(embtk_toolsb)/gcc-$(GCC_VERSION)
 
 GCC_MULTILIB	:= --disable-multilib
+GCC_DEPS	:= gmp_host_install mpfr_host_install mpc_host_install
 
 #
 # Selected languages to support in the toolchain
@@ -114,14 +115,16 @@ GCC1_BUILD_DIR		:= $(embtk_toolsb)/gcc1-build
 GCC1_KCONFIGS_NAME	:= GCC
 GCC1_KEEP_SRC_DIR	:= y
 
+GCC1_DEPS		:= $(GCC_DEPS)
+
 GCC1_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
 GCC1_PREFIX		:= $(embtk_tools)
 GCC1_CONFIGURE_OPTS	:= --with-sysroot=$(embtk_sysroot)			\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
 	$(GCC_MULTILIB)								\
-	--with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR)			\
-	--with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL)		\
+	--with-gmp=$(embtk_htools) --with-mpfr=$(embtk_htools)			\
+	--with-mpc=$(embtk_htools) --with-bugurl=$(EMBTK_BUGURL)		\
 	--with-pkgversion=embtoolkit-$(EMBTK_VERSION)				\
 	--without-headers --with-newlib --disable-shared --disable-threads	\
 	--disable-libssp --disable-libgomp --disable-libmudflap --disable-nls	\
@@ -144,14 +147,16 @@ GCC2_BUILD_DIR		:= $(embtk_toolsb)/gcc2-build
 GCC2_KCONFIGS_NAME	:= GCC
 GCC2_KEEP_SRC_DIR	:= y
 
+GCC2_DEPS		:= $(GCC_DEPS)
+
 GCC2_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
 GCC2_PREFIX		:= $(embtk_tools)
 GCC2_CONFIGURE_OPTS	:= --with-sysroot=$(embtk_sysroot)			\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
 	$(GCC_MULTILIB)								\
-	--with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR)			\
-	--with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL)		\
+	--with-gmp=$(embtk_htools) --with-mpfr=$(embtk_htools)			\
+	--with-mpc=$(embtk_htools) --with-bugurl=$(EMBTK_BUGURL)		\
 	--with-pkgversion=embtoolkit-$(EMBTK_VERSION)				\
 	--disable-libquadmath							\
 	--disable-libssp --disable-libgomp --disable-libmudflap --disable-nls	\
@@ -178,14 +183,16 @@ GCC3_SRC_DIR		:= $(GCC_SRC_DIR)
 GCC3_BUILD_DIR		:= $(embtk_toolsb)/gcc3-build
 GCC3_KCONFIGS_NAME	:= GCC
 
+GCC3_DEPS		:= $(GCC_DEPS)
+
 GCC3_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
 GCC3_PREFIX		:= $(embtk_tools)
 GCC3_CONFIGURE_OPTS	:= --with-sysroot=$(embtk_sysroot)			\
 	--target=$(STRICT_GNU_TARGET) $(GCC_WITH_ABI) $(GCC_WITH_ARCH)		\
 	$(GCC_WITH_CPU) $(GCC_WITH_FLOAT) $(GCC_WITH_FPU) $(GCC_WITH_TUNE)	\
 	$(GCC_MULTILIB)								\
-	--with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR)			\
-	--with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL)		\
+	--with-gmp=$(embtk_htools)/usr --with-mpfr=$(embtk_htools)/usr		\
+	--with-mpc=$(embtk_htools)/usr --with-bugurl=$(EMBTK_BUGURL)		\
 	--with-pkgversion=embtoolkit-$(EMBTK_VERSION)				\
 	--disable-libssp --disable-libgomp --disable-libmudflap --disable-nls	\
 	--disable-libquadmath							\
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk
index 256560e..98d44f1 100644
--- a/core/toolchain/toolchain.mk
+++ b/core/toolchain/toolchain.mk
@@ -34,15 +34,6 @@ include packages/htools/libtool/vars.mk
 include packages/htools/autoconf/vars.mk
 include packages/htools/automake/vars.mk
 
-# GMP
-include core/mk/gmp.mk
-
-# MPFR
-include core/mk/mpfr.mk
-
-# MPC
-include core/mk/mpc.mk
-
 #
 # binutils
 #
@@ -133,8 +124,7 @@ else
 __llvm_compiler-rt-$(CONFIG_EMBTK_HAVE_COMPILER-RT) := compiler-rt_install
 endif
 
-TOOLCHAIN_DEPS-y	:= linux_headers_install gmp_host_install
-TOOLCHAIN_DEPS-y	+= mpfr_host_install mpc_host_install binutils_install
+TOOLCHAIN_DEPS-y	:= linux_headers_install binutils_install
 TOOLCHAIN_DEPS-$(CONFIG_EMBTK_HOST_HAVE_LLVM) += llvm_host_install
 TOOLCHAIN_DEPS-y	+= gcc1_install
 TOOLCHAIN_DEPS-$(CONFIG_EMBTK_CLIB_UCLIBC) += $(embtk_clib)_headers_install gcc2_install
diff --git a/core/kconfig/gmp.kconfig b/packages/htools/gmp/gmp.kconfig
index 3cb2dd0..3cb2dd0 100644
--- a/core/kconfig/gmp.kconfig
+++ b/packages/htools/gmp/gmp.kconfig
diff --git a/core/mk/gmp.mk b/packages/htools/gmp/gmp.mk
index aa48721..467c6a9 100644
--- a/core/mk/gmp.mk
+++ b/packages/htools/gmp/gmp.mk
@@ -29,13 +29,5 @@ GMP_HOST_SITE		:= ftp://ftp.gmplib.org/pub/gmp-$(GMP_HOST_VERSION)
 GMP_HOST_PACKAGE	:= gmp-$(GMP_HOST_VERSION).tar.bz2
 GMP_HOST_SRC_DIR	:= $(embtk_toolsb)/gmp-$(GMP_HOST_VERSION)
 GMP_HOST_BUILD_DIR	:= $(embtk_toolsb)/gmp-build
-GMP_HOST_DIR		:= $(embtk_htools)/usr/local/gmp-host
-
-export GMP_HOST_DIR
 
 GMP_HOST_CONFIGURE_OPTS	:= --disable-shared --enable-static
-GMP_HOST_PREFIX		:= $(GMP_HOST_DIR)
-
-define embtk_cleanup_gmp_host
-	rm -rf $(GMP_HOST_BUILD_DIR)
-endef
diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig
index 482b590..b1d7318 100644
--- a/packages/htools/hosttools-buildopts.kconfig
+++ b/packages/htools/hosttools-buildopts.kconfig
@@ -82,17 +82,17 @@ source packages/htools/gperf/gperf.kconfig
 #
 # GMP
 #
-source core/kconfig/gmp.kconfig
+source packages/htools/gmp/gmp.kconfig
 
 #
 # MPFR
 #
-source core/kconfig/mpfr.kconfig
+source packages/htools/mpfr/mpfr.kconfig
 
 #
 # MPC
 #
-source core/kconfig/mpc.kconfig
+source packages/htools/mpc/mpc.kconfig
 
 #
 # ccache
diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk
index c820883..3ff097b 100644
--- a/packages/htools/hosttools-buildopts.mk
+++ b/packages/htools/hosttools-buildopts.mk
@@ -41,6 +41,12 @@ $(call embtk_include_hostpkg,fakeroot_host)
 # gmake
 $(call embtk_include_hostpkg,gmake_host)
 
+# gmp
+$(call embtk_include_hostpkg,gmp_host)
+
+# gperf
+$(call embtk_include_hostpkg,gperf_host)
+
 # gsed
 $(call embtk_include_hostpkg,gsed_host)
 
@@ -50,6 +56,12 @@ $(call embtk_include_hostpkg,libelf_host)
 # libtool
 $(call embtk_include_hostpkg,libtool_host)
 
+# mpc
+$(call embtk_include_hostpkg,mpc_host)
+
+# mpfr
+$(call embtk_include_hostpkg,mpfr_host)
+
 # mtd-utils
 $(call embtk_include_hostpkg,mtdutils_host)
 
@@ -65,6 +77,3 @@ $(call embtk_include_hostpkg,squashfs_host)
 
 # zlib
 $(call embtk_include_hostpkg,zlib_host)
-
-# gperf
-$(call embtk_include_hostpkg,gperf_host)
diff --git a/core/kconfig/mpc.kconfig b/packages/htools/mpc/mpc.kconfig
index 3b5ece8..3b5ece8 100644
--- a/core/kconfig/mpc.kconfig
+++ b/packages/htools/mpc/mpc.kconfig
diff --git a/core/mk/mpc.mk b/packages/htools/mpc/mpc.mk
index 8f465ba..acea500 100644
--- a/core/mk/mpc.mk
+++ b/packages/htools/mpc/mpc.mk
@@ -28,16 +28,10 @@ MPC_HOST_VERSION	:= $(call embtk_get_pkgversion,mpc_host)
 MPC_HOST_SITE		:= http://www.multiprecision.org/mpc/download
 MPC_HOST_PACKAGE	:= mpc-$(MPC_HOST_VERSION).tar.gz
 MPC_HOST_SRC_DIR	:= $(embtk_toolsb)/mpc-$(MPC_HOST_VERSION)
-MPC_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpc-build
-MPC_HOST_DIR		:= $(embtk_htools)/usr/local/mpc-host
+MPC_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpc-$(MPC_HOST_VERSION)-build
 
-export MPC_HOST_DIR
+MPC_HOST_DEPS	:= gmp_host_install mpfr_host_install
 
-MPC_HOST_CONFIGURE_OPTS	:= --disable-shared --enable-static	\
-				--with-gmp=$(GMP_HOST_DIR)	\
-				--with-mpfr=$(MPFR_HOST_DIR)
-MPC_HOST_PREFIX		:= $(MPC_HOST_DIR)
-
-define embtk_cleanup_mpc_host
-	rm -rf $(MPC_HOST_BUILD_DIR)
-endef
+MPC_HOST_CONFIGURE_OPTS	:= --disable-shared --enable-static
+MPC_HOST_CONFIGURE_OPTS	+= --with-gmp=$(embtk_htools)
+MPC_HOST_CONFIGURE_OPTS	+= --with-mpfr=$(embtk_htools)
diff --git a/core/kconfig/mpfr.kconfig b/packages/htools/mpfr/mpfr.kconfig
index a944cf8..a944cf8 100644
--- a/core/kconfig/mpfr.kconfig
+++ b/packages/htools/mpfr/mpfr.kconfig
diff --git a/core/mk/mpfr.mk b/packages/htools/mpfr/mpfr.mk
index fc242f6..87a7f74 100644
--- a/core/mk/mpfr.mk
+++ b/packages/htools/mpfr/mpfr.mk
@@ -28,15 +28,9 @@ MPFR_HOST_VERSION	:= $(call embtk_get_pkgversion,mpfr_host)
 MPFR_HOST_SITE		:= http://www.mpfr.org/mpfr-$(MPFR_HOST_VERSION)
 MPFR_HOST_PACKAGE	:= mpfr-$(MPFR_HOST_VERSION).tar.bz2
 MPFR_HOST_SRC_DIR	:= $(embtk_toolsb)/mpfr-$(MPFR_HOST_VERSION)
-MPFR_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpfr-build
-MPFR_HOST_DIR		:= $(embtk_htools)/usr/local/mpfr-host
+MPFR_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpfr-$(MPFR_HOST_VERSION)-build
 
-export MPFR_HOST_DIR
+MPFR_HOST_DEPS	:= gmp_host_install
 
 MPFR_HOST_CONFIGURE_OPTS	:= --disable-shared --enable-static
-MPFR_HOST_CONFIGURE_OPTS	+= --with-gmp=$(GMP_HOST_DIR)
-MPFR_HOST_PREFIX		:= $(MPFR_HOST_DIR)
-
-define embtk_cleanup_mpfr_host
-	rm -rf $(MPFR_HOST_BUILD_DIR)
-endef
+MPFR_HOST_CONFIGURE_OPTS	+= --with-gmp=$(embtk_htools)