replace host-mpc with host-system-mpc

This is a first step to make gcc plugins possible.
The header files for plugins include the headers for several of host
libraries that are currently statically compiled.
Use the system versions of those libraries. This way the user can install
the corresponding devel packages. Then gcc plugins can be built.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 34 insertions, 48 deletions

diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 2339f46..4f40bd4 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -7,7 +7,7 @@ menuconfig CROSS_GCC
 	select LIBC_FIRST
 	select HOST_SYSTEM_GMP	if CROSS_GCC_43
 	select HOST_SYSTEM_MPFR	if CROSS_GCC_43
-	select HOST_MPC		if CROSS_GCC_43
+	select HOST_SYSTEM_MPC	if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
 	select HOST_SYSTEM_ISL	if CROSS_GCC_48
@@ -248,7 +248,7 @@ config CROSS_GCC_FIRST
 	select LIBC_HEADERS
 	select HOST_SYSTEM_GMP	if CROSS_GCC_43
 	select HOST_SYSTEM_MPFR	if CROSS_GCC_43
-	select HOST_MPC		if CROSS_GCC_43
+	select HOST_SYSTEM_MPC	if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
 	select HOST_SYSTEM_ISL	if CROSS_GCC_48
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index 3fcb796..3bd9abb 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -88,7 +88,7 @@ CROSS_GCC_AUTOCONF_COMMON := \
 	\
 	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_GMP,--with-gmp) \
 	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_MPFR,--with-mpfr) \
-	$(call ptx/ifdef,PTXCONF_HOST_MPC,--with-mpc) \
+	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_MPC,--with-mpc) \
 	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_ISL,--with-isl)
 
 ifndef PTXCONF_TOOLCHAIN_DEBUG
diff --git a/rules/host-mpc.in b/rules/host-mpc.in
deleted file mode 100644
index 2564d09..0000000
--- a/rules/host-mpc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_MPC
-	bool
-	select HOST_GMP
-	select HOST_MPFR
diff --git a/rules/host-mpc.make b/rules/host-mpc.make
deleted file mode 100644
index 407fa0a..0000000
--- a/rules/host-mpc.make
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007-2008 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_MPC) += host-mpc
-
-#
-# Paths and names
-#
-HOST_MPC_VERSION	:= 1.1.0
-HOST_MPC_MD5		:= 4125404e41e482ec68282a2e687f6c73
-HOST_MPC		:= mpc-$(HOST_MPC_VERSION)
-HOST_MPC_SUFFIX		:= tar.gz
-HOST_MPC_URL		:= $(call ptx/mirror, GNU, mpc/$(HOST_MPC).$(HOST_MPC_SUFFIX))
-HOST_MPC_SOURCE		:= $(SRCDIR)/$(HOST_MPC).$(HOST_MPC_SUFFIX)
-HOST_MPC_DIR		:= $(HOST_BUILDDIR)/$(HOST_MPC)
-HOST_MPC_LICENSE	:= LGPL-3.0-or-later
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_MPC_CONF_TOOL	:= autoconf
-HOST_MPC_CONF_OPT	:= \
-	$(PTX_HOST_AUTOCONF) \
-	--disable-shared \
-	--enable-static
-
-# vim: syntax=make
diff --git a/rules/host-system-mpc.in b/rules/host-system-mpc.in
new file mode 100644
index 0000000..e146fd3
--- /dev/null
+++ b/rules/host-system-mpc.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEM_MPC
+	tristate
diff --git a/rules/host-system-mpc.make b/rules/host-system-mpc.make
new file mode 100644
index 0000000..ec2991d
--- /dev/null
+++ b/rules/host-system-mpc.make
@@ -0,0 +1,27 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_SYSTEM_MPC) += host-system-mpc
+HOST_SYSTEM_MPC_LICENSE	:= ignore
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-system-mpc.prepare:
+	@$(call targetinfo)
+	@echo "Checking for mpc ..."
+	@echo "#include <mpc.h>" | $(HOSTCC) -x c -c -o /dev/null - 2>/dev/null || \
+		ptxd_bailout "mpc development files not found!" \
+		"Please install libmpc-dev (debian)"
+	@$(call touch)
+
+# vim: syntax=make