Toolchain: gmp, mpfr, mpc are for toolchain internal - do not show them in kconfig

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

7 files changed, 34 insertions, 139 deletions

diff --git a/kconfig/gmp.kconfig b/kconfig/gmp.kconfig
index ca39877..3cb2dd0 100644
--- a/kconfig/gmp.kconfig
+++ b/kconfig/gmp.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,54 +18,17 @@
 ################################################################################
 #
 # \file         gmp.kconfig
-# \brief	gmp.kconfig of Embtoolkit
+# \brief	gmp.kconfig of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
-
-config EMBTK_HAVE_GMP
-	bool
-
 config EMBTK_HOST_HAVE_GMP
 	bool
 	default y
 
-choice
-	prompt "Version of gmp you wish"
-	depends on EMBTK_HOST_HAVE_GMP || EMBTK_HAVE_GMP
-	help
-		GMP is a free library for arbitrary precision arithmetic,
-		operating on signed integers, rational numbers, and floating
-		point numbers.
-
-	config EMBTK_GMP_VERSION_5_0_4
-		bool "gmp-5.0.4"
-	config EMBTK_GMP_VERSION_4_3_2
-		bool "gmp-4.3.2"
-	config EMBTK_GMP_VERSION_4_3_1
-		bool "gmp-4.3.1"
-		depends on EMBTK_OLDPACKAGES
-	config EMBTK_GMP_VERSION_4_3_0
-		bool "gmp-4.3.0"
-		depends on EMBTK_OLDPACKAGES
-	config EMBTK_GMP_VERSION_4_2_4
-		bool "gmp-4.2.4"
-endchoice
-
-config EMBTK_GMP_VERSION_STRING
+config EMBTK_GMP_HOST_VERSION_STRING
 	string
-	default "5.0.4" if EMBTK_GMP_VERSION_5_0_4
-	default "4.3.2" if EMBTK_GMP_VERSION_4_3_2
-	default "4.3.1" if EMBTK_GMP_VERSION_4_3_1
-	default "4.3.0" if EMBTK_GMP_VERSION_4_3_0
-	default "4.2.4" if EMBTK_GMP_VERSION_4_2_4
-
-config EMBTK_GMP_NEED_PATCH
-	bool
-	select EMBTK_GMP_HOST_NEED_PATCH
-config EMBTK_GMP_NEED_AUTORECONF
-	bool
-	select EMBTK_GMP_HOST_NEED_AUTORECONF
+	default "5.0.4"
 
 config EMBTK_GMP_HOST_NEED_PATCH
 	bool
diff --git a/kconfig/mpc.kconfig b/kconfig/mpc.kconfig
index 1de1336..3b5ece8 100644
--- a/kconfig/mpc.kconfig
+++ b/kconfig/mpc.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2010-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2010-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,53 +17,21 @@
 #
 ################################################################################
 #
-# \file         mpchost.kconfig
-# \brief	mpchost.kconfig of Embtoolkit
+# \file         mpc.kconfig
+# \brief	mpc.kconfig of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         Jan 2010
 ################################################################################
 
-config EMBTK_HAVE_MPC
-	bool
-
 config EMBTK_HOST_HAVE_MPC
 	bool
 	default y
-choice
-	prompt "Version of mpc you wish"
-	depends on EMBTK_HOST_HAVE_MPC || EMBTK_HAVE_MPC
-	help
-		Mpc is a C library for the arithmetic of complex numbers with
-		arbitrarily high precision and correct rounding of the result.
-		MPC is mandatory to build GCC
-
-	config EMBTK_MPC_VERSION_0_8_2
-		bool "mpc-0.8.2"
-	config EMBTK_MPC_VERSION_0_8_1
-		bool "mpc-0.8.1"
-endchoice
 
-config EMBTK_MPC_VERSION_STRING
+config EMBTK_MPC_HOST_VERSION_STRING
 	string
-	default "0.8.2"		if EMBTK_MPC_VERSION_0_8_2
-	default "0.8.1"		if EMBTK_MPC_VERSION_0_8_1
-
-config EMBTK_MPC_NEED_PATCH
-	bool
-	select EMBTK_MPC_HOST_NEED_PATCH
-config EMBTK_MPC_NEED_AUTORECONF
-	bool
-	select EMBTK_MPC_HOST_NEED_AUTORECONF
-config EMBTK_MPC_PKG_IS_TARGZ
-	bool
-config EMBTK_MPC_PKG_IS_TARBZ2
-	bool
+	default "0.8.2"
 
 config EMBTK_MPC_HOST_NEED_PATCH
 	bool
 config EMBTK_MPC_HOST_NEED_AUTORECONF
 	bool
-config EMBTK_MPC_HOST_PKG_IS_TARGZ
-	bool
-config EMBTK_MPC_HOST_PKG_IS_TARBZ2
-	bool
diff --git a/kconfig/mpfr.kconfig b/kconfig/mpfr.kconfig
index 91de2e7..a944cf8 100644
--- a/kconfig/mpfr.kconfig
+++ b/kconfig/mpfr.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,59 +18,20 @@
 ################################################################################
 #
 # \file         mpfr.kconfig
-# \brief	mpfr.kconfig of Embtoolkit
+# \brief	mpfr.kconfig of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
 
-config EMBTK_HAVE_MPFR
-	bool
-
 config EMBTK_HOST_HAVE_MPFR
 	bool
 	default y
 
-choice
-	prompt "Version of mpfr you wish"
-	depends on EMBTK_HAVE_MPFR || EMBTK_HOST_HAVE_MPFR
-	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_VERSION_2_4_2
-		bool "mpfr-2.4.2"
-		select EMBTK_MPFR_NEED_PATCH
-	config EMBTK_MPFR_HOST_VERSION_2_4_1
-		bool "mpfr-2.4.1"
-		select EMBTK_MPFR_NEED_PATCH
-	config EMBTK_MPFR_VERSION_2_4_0
-		bool "mpfr-2.4.0"
-		select EMBTK_MPFR_NEED_PATCH
-endchoice
-
-config EMBTK_MPFR_VERSION_STRING
+config EMBTK_MPFR_HOST_VERSION_STRING
 	string
-	default "2.4.2"		if EMBTK_MPFR_VERSION_2_4_2
-	default "2.4.1"		if EMBTK_MPFR_VERSION_2_4_1
-	default "2.4.0"		if EMBTK_MPFR_VERSION_2_4_0
-
-config EMBTK_MPFR_NEED_PATCH
-	bool
-	select EMBTK_MPFR_HOST_NEED_PATCH
-config EMBTK_MPFR_NEED_AUTORECONF
-	bool
-	select EMBTK_MPFR_HOST_NEED_AUTORECONF
-config EMBTK_MPFR_PKG_IS_TARGZ
-	bool
-config EMBTK_MPFR_PKG_IS_TARBZ2
-	bool
+	default "2.4.2"
 
 config EMBTK_MPFR_HOST_NEED_PATCH
 	bool
 config EMBTK_MPFR_HOST_NEED_AUTORECONF
 	bool
-config EMBTK_MPFR_HOST_PKG_IS_TARGZ
-	bool
-config EMBTK_MPFR_HOST_PKG_IS_TARBZ2
-	bool
diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig
index f5727d1..bd5029c 100644
--- a/kconfig/toolchain.kconfig
+++ b/kconfig/toolchain.kconfig
@@ -67,17 +67,20 @@ menu "Linux kernel headers"
 source "kconfig/linux.kconfig"
 endmenu
 
-menu "GMP"
-source "kconfig/gmp.kconfig"
-endmenu
+#
+# GMP
+#
+source kconfig/gmp.kconfig
 
-menu "MPFR"
-source "kconfig/mpfr.kconfig"
-endmenu
+#
+# MPFR
+#
+source kconfig/mpfr.kconfig
 
-menu "MPC"
-source "kconfig/mpc.kconfig"
-endmenu
+#
+# MPC
+#
+source kconfig/mpc.kconfig
 
 #
 # ccache
diff --git a/mk/gmp.mk b/mk/gmp.mk
index d37ba66..a10bea1 100644
--- a/mk/gmp.mk
+++ b/mk/gmp.mk
@@ -18,13 +18,13 @@
 ################################################################################
 #
 # \file         gmp.mk
-# \brief	gmp.mk of Embtoolkit
+# \brief	gmp.mk of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
 
 GMP_HOST_NAME		:= gmp
-GMP_HOST_VERSION	:= $(call embtk_get_pkgversion,gmp)
+GMP_HOST_VERSION	:= $(call embtk_get_pkgversion,gmp_host)
 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	:= $(TOOLS_BUILD)/gmp-$(GMP_HOST_VERSION)
diff --git a/mk/mpc.mk b/mk/mpc.mk
index 0b55558..5a69dc6 100644
--- a/mk/mpc.mk
+++ b/mk/mpc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,14 +17,14 @@
 #
 ################################################################################
 #
-# \file         mpchost.mk
-# \brief	mpchost.mk of Embtoolkit. To build gcc, we need mpc.
+# \file         mpc.mk
+# \brief	mpch.mk of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         Jan 2010
 ################################################################################
 
 MPC_HOST_NAME		:= mpc
-MPC_HOST_VERSION	:= $(call embtk_get_pkgversion,mpc)
+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	:= $(TOOLS_BUILD)/mpc-$(MPC_HOST_VERSION)
diff --git a/mk/mpfr.mk b/mk/mpfr.mk
index 0224f4d..5b908f2 100644
--- a/mk/mpfr.mk
+++ b/mk/mpfr.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,13 +18,13 @@
 ################################################################################
 #
 # \file         mpfr.mk
-# \brief	mpfr.mk of Embtoolkit
+# \brief	mpfr.mk of Embtoolkit for toolchain
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
 
 MPFR_HOST_NAME		:= mpfr
-MPFR_HOST_VERSION	:= $(call embtk_get_pkgversion,mpfr)
+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	:= $(TOOLS_BUILD)/mpfr-$(MPFR_HOST_VERSION)