replace host-mpfr with host-system-mpfr

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, 50 deletions

diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 03ca742..2339f46 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -6,7 +6,7 @@ menuconfig CROSS_GCC
 	select CROSS_BINUTILS
 	select LIBC_FIRST
 	select HOST_SYSTEM_GMP	if CROSS_GCC_43
-	select HOST_MPFR	if CROSS_GCC_43
+	select HOST_SYSTEM_MPFR	if CROSS_GCC_43
 	select HOST_MPC		if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
@@ -247,7 +247,7 @@ config CROSS_GCC_FIRST
 	select CROSS_ELF2FLT	if UCLIBC
 	select LIBC_HEADERS
 	select HOST_SYSTEM_GMP	if CROSS_GCC_43
-	select HOST_MPFR	if CROSS_GCC_43
+	select HOST_SYSTEM_MPFR	if CROSS_GCC_43
 	select HOST_MPC		if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index c324a8d..3fcb796 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -87,7 +87,7 @@ CROSS_GCC_AUTOCONF_COMMON := \
 	--with-system-zlib \
 	\
 	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_GMP,--with-gmp) \
-	$(call ptx/ifdef,PTXCONF_HOST_MPFR,--with-mpfr) \
+	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_MPFR,--with-mpfr) \
 	$(call ptx/ifdef,PTXCONF_HOST_MPC,--with-mpc) \
 	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_ISL,--with-isl)
 
diff --git a/rules/host-mpfr.in b/rules/host-mpfr.in
deleted file mode 100644
index 4887ba4..0000000
--- a/rules/host-mpfr.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_MPFR
-	select HOST_GMP
-	bool
diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make
deleted file mode 100644
index 24fba4d..0000000
--- a/rules/host-mpfr.make
+++ /dev/null
@@ -1,42 +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_MPFR) += host-mpfr
-
-#
-# Paths and names
-#
-HOST_MPFR_VERSION	:= 4.0.2
-HOST_MPFR_MD5		:= 6d8a8bb46fe09ff44e21cdbf84f5cdac
-HOST_MPFR		:= mpfr-$(HOST_MPFR_VERSION)
-HOST_MPFR_SUFFIX	:= tar.bz2
-HOST_MPFR_SOURCE	:= $(SRCDIR)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX)
-HOST_MPFR_DIR		:= $(HOST_BUILDDIR)/$(HOST_MPFR)
-HOST_MPFR_LICENSE	:= LGPL-3.0-or-later
-
-HOST_MPFR_URL		:= \
-	http://www.mpfr.org/mpfr-$(HOST_MPFR_VERSION)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) \
-	http://cross-lfs.org/files/packages/svn/$(HOST_MPFR).$(HOST_MPFR_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_MPFR_CONF_TOOL	:= autoconf
-HOST_MPFR_CONF_OPT	:= \
-	$(PTX_HOST_AUTOCONF) \
-	--disable-shared \
-	--enable-static
-
-# vim: syntax=make
diff --git a/rules/host-system-mpfr.in b/rules/host-system-mpfr.in
new file mode 100644
index 0000000..95361d0
--- /dev/null
+++ b/rules/host-system-mpfr.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEM_MPFR
+	tristate
diff --git a/rules/host-system-mpfr.make b/rules/host-system-mpfr.make
new file mode 100644
index 0000000..9dab7bb
--- /dev/null
+++ b/rules/host-system-mpfr.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_MPFR) += host-system-mpfr
+HOST_SYSTEM_MPFR_LICENSE	:= ignore
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-system-mpfr.prepare:
+	@$(call targetinfo)
+	@echo "Checking for mpfr ..."
+	@echo "#include <mpfr.h>" | $(HOSTCC) -x c -c -o /dev/null - 2>/dev/null || \
+		ptxd_bailout "mpfr development files not found!" \
+		"Please install libmpfr-dev (debian)"
+	@$(call touch)
+
+# vim: syntax=make