Toolchain: gmp, mpfr, mpc, binutils: use generic macros

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

7 files changed, 206 insertions, 116 deletions

diff --git a/kconfig/binutils.kconfig b/kconfig/binutils.kconfig
index 6a3c4cd..c668144 100644
--- a/kconfig/binutils.kconfig
+++ b/kconfig/binutils.kconfig
@@ -21,12 +21,18 @@
 # \brief	binutils.kconfig of Embtoolkit
 # \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
-################################################################################
+###############################################################################
+
+config EMBTK_HAVE_BINUTILS
+	bool
+	select EMBTK_BINUTILS_PKG_IS_TARBZ2
+	default y
 
 choice
 	prompt "Version of binutils you wish"
+	depends on EMBTK_HAVE_BINUTILS
 	help
-		Here you can choose which version on binutils your toochain
+		Here you can choose which version of binutils your toochain
 		will use.
 	config EMBTK_BINUTILS_VERSION_2_21_1
 		bool "binutils-2.21.1"
@@ -37,6 +43,7 @@ choice
 	config EMBTK_BINUTILS_VERSION_2_20
 		bool "binutils-2.20"
 		select EMBTK_BINUTILS_PKG_IS_TARBZ2
+		depends on EMBTK_OLDPACKAGES
 	config EMBTK_BINUTILS_VERSION_2_19_1
 		bool "binutils-2.19.1"
 		select EMBTK_BINUTILS_PKG_IS_TARBZ2
diff --git a/kconfig/gmp.kconfig b/kconfig/gmp.kconfig
new file mode 100644
index 0000000..fa6b713
--- /dev/null
+++ b/kconfig/gmp.kconfig
@@ -0,0 +1,82 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2009-2011 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
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         gmp.kconfig
+# \brief	gmp.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         May 2009
+################################################################################
+
+config EMBTK_HAVE_GMP
+	bool
+	select EMBTK_GMP_PKG_IS_TARBZ2
+
+config EMBTK_HOST_HAVE_GMP
+	bool
+	select EMBTK_GMP_PKG_IS_TARBZ2
+	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_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
+	string
+	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
+config EMBTK_GMP_PKG_IS_TARGZ
+	bool
+	select EMBTK_GMP_HOST_PKG_IS_TARGZ
+config EMBTK_GMP_PKG_IS_TARBZ2
+	bool
+	select EMBTK_GMP_HOST_PKG_IS_TARBZ2
+
+config EMBTK_GMP_HOST_NEED_PATCH
+	bool
+config EMBTK_GMP_HOST_NEED_AUTORECONF
+	bool
+config EMBTK_GMP_HOST_PKG_IS_TARGZ
+	bool
+config EMBTK_GMP_HOST_PKG_IS_TARBZ2
+	bool
diff --git a/kconfig/gmphost.kconfig b/kconfig/gmphost.kconfig
deleted file mode 100644
index ca75069..0000000
--- a/kconfig/gmphost.kconfig
+++ /dev/null
@@ -1,50 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
-#
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-################################################################################
-#
-# \file         gmphost.kconfig
-# \brief	gmphost.kconfig of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         May 2009
-################################################################################
-
-choice
-	prompt "Version of gmp you wish"
-	help
-		GMP is a free library for arbitrary precision arithmetic,
-		operating on signed integers, rational numbers,
-		and floating point numbers.
-		GMP is necessary in order to build MPFR.
-
-	config EMBTK_GMP_HOST_VERSION_4_3_2
-		bool "gmp-4.3.2"
-	config EMBTK_GMP_HOST_VERSION_4_3_1
-		bool "gmp-4.3.1"
-		depends on EMBTK_OLDPACKAGES
-	config EMBTK_GMP_HOST_VERSION_4_3_0
-		bool "gmp-4.3.0"
-		depends on EMBTK_OLDPACKAGES
-	config EMBTK_GMP_HOST_VERSION_4_2_4
-		bool "gmp-4.2.4"
-endchoice
-
-config EMBTK_GMP_HOST_VERSION_STRING
-string
-default "4.3.2" if EMBTK_GMP_HOST_VERSION_4_3_2
-default "4.3.1" if EMBTK_GMP_HOST_VERSION_4_3_1
-default "4.3.0" if EMBTK_GMP_HOST_VERSION_4_3_0
-default "4.2.4" if EMBTK_GMP_HOST_VERSION_4_2_4
diff --git a/kconfig/mpchost.kconfig b/kconfig/mpc.kconfig
index a617bc2..01deba9 100644
--- a/kconfig/mpchost.kconfig
+++ b/kconfig/mpc.kconfig
@@ -23,26 +23,51 @@
 # \date         Jan 2010
 ################################################################################
 
+config EMBTK_HAVE_MPC
+	bool
+	select EMBTK_MPC_PKG_IS_TARGZ
+
+config EMBTK_HOST_HAVE_MPC
+	bool
+	select EMBTK_MPC_PKG_IS_TARGZ
+	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_HOST_VERSION_0_8_2
+	config EMBTK_MPC_VERSION_0_8_2
 		bool "mpc-0.8.2"
-	config EMBTK_MPC_HOST_VERSION_0_8_1
+	config EMBTK_MPC_VERSION_0_8_1
 		bool "mpc-0.8.1"
 endchoice
 
-#Version string
-config EMBTK_MPC_HOST_VERSION_STRING
+config EMBTK_MPC_VERSION_STRING
 	string
-	default "0.8.2"		if EMBTK_MPC_HOST_VERSION_0_8_2
-	default "0.8.1"		if EMBTK_MPC_HOST_VERSION_0_8_1
+	default "0.8.2"		if EMBTK_MPC_VERSION_0_8_2
+	default "0.8.1"		if EMBTK_MPC_VERSION_0_8_1
 
-#Does we need patches?
 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
+	select EMBTK_MPC_HOST_PKG_IS_TARGZ
+config EMBTK_MPC_PKG_IS_TARBZ2
+	bool
+	select EMBTK_MPC_HOST_PKG_IS_TARBZ2
 
+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
new file mode 100644
index 0000000..3b8a36d
--- /dev/null
+++ b/kconfig/mpfr.kconfig
@@ -0,0 +1,80 @@
+################################################################################
+# Embtoolkit
+# Copyright(C) 2009-2011 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
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         mpfr.kconfig
+# \brief	mpfr.kconfig of Embtoolkit
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         May 2009
+################################################################################
+
+config EMBTK_HAVE_MPFR
+	bool
+	select EMBTK_MPFR_PKG_IS_TARBZ2
+
+config EMBTK_HOST_HAVE_MPFR
+	bool
+	select EMBTK_MPFR_PKG_IS_TARBZ2
+	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
+	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
+	select EMBTK_MPFR_HOST_PKG_IS_TARGZ
+config EMBTK_MPFR_PKG_IS_TARBZ2
+	bool
+	select EMBTK_MPFR_HOST_PKG_IS_TARBZ2
+
+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/mpfrhost.kconfig b/kconfig/mpfrhost.kconfig
deleted file mode 100644
index ed81d78..0000000
--- a/kconfig/mpfrhost.kconfig
+++ /dev/null
@@ -1,54 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
-#
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-################################################################################
-#
-# \file         mpfrhost.kconfig
-# \brief	mpfrhost.kconfig of Embtoolkit
-# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
-# \date         May 2009
-################################################################################
-
-choice
-	prompt "Version of mpfr you wish"
-	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"
-		select EMBTK_MPFR_HOST_VERSION_PATCH
-	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.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
-	bool
-
diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig
index 251c722..de62709 100644
--- a/kconfig/toolchain.kconfig
+++ b/kconfig/toolchain.kconfig
@@ -68,15 +68,15 @@ source "kconfig/linux.kconfig"
 endmenu
 
 menu "GMP"
-source "kconfig/gmphost.kconfig"
+source "kconfig/gmp.kconfig"
 endmenu
 
 menu "MPFR"
-source "kconfig/mpfrhost.kconfig"
+source "kconfig/mpfr.kconfig"
 endmenu
 
 menu "MPC"
-source "kconfig/mpchost.kconfig"
+source "kconfig/mpc.kconfig"
 endmenu
 
 #