replace host-isl with host-system-isl

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.

libisl is not needed for plugins but one more dependency into the system
makes no difference and this makes maintaining the toolchain easier.

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

6 files changed, 30 insertions, 51 deletions

diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index c90989a..ed25365 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -10,7 +10,7 @@ menuconfig CROSS_GCC
 	select HOST_MPC		if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
-	select HOST_ISL		if CROSS_GCC_48
+	select HOST_SYSTEM_ISL	if CROSS_GCC_48
 	select CROSS_ECJ	if CROSS_GCC_LANG_JAVA
 
 if CROSS_GCC
@@ -251,5 +251,5 @@ config CROSS_GCC_FIRST
 	select HOST_MPC		if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
-	select HOST_ISL		if CROSS_GCC_48
+	select HOST_SYSTEM_ISL	if CROSS_GCC_48
 
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index 523e485..b7fb390 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -89,7 +89,7 @@ CROSS_GCC_AUTOCONF_COMMON := \
 	$(call ptx/ifdef,PTXCONF_HOST_GMP,--with-gmp) \
 	$(call ptx/ifdef,PTXCONF_HOST_MPFR,--with-mpfr) \
 	$(call ptx/ifdef,PTXCONF_HOST_MPC,--with-mpc) \
-	$(call ptx/ifdef,PTXCONF_HOST_ISL,--with-isl)
+	$(call ptx/ifdef,PTXCONF_HOST_SYSTEM_ISL,--with-isl)
 
 ifndef PTXCONF_TOOLCHAIN_DEBUG
 CROSS_GCC_AUTOCONF_COMMON += \
diff --git a/rules/host-isl.in b/rules/host-isl.in
deleted file mode 100644
index b0572a1..0000000
--- a/rules/host-isl.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_ISL
-	bool
-	select HOST_GMP
diff --git a/rules/host-isl.make b/rules/host-isl.make
deleted file mode 100644
index 49cc3c1..0000000
--- a/rules/host-isl.make
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 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_ISL) += host-isl
-
-#
-# Paths and names
-#
-HOST_ISL_VERSION	:= 0.22.1
-HOST_ISL_MD5		:= ccb699cc4e8a806e5300aade656f629a
-HOST_ISL		:= isl-$(HOST_ISL_VERSION)
-HOST_ISL_SUFFIX		:= tar.bz2
-HOST_ISL_URL		:= http://isl.gforge.inria.fr/$(HOST_ISL).$(HOST_ISL_SUFFIX)
-HOST_ISL_SOURCE		:= $(SRCDIR)/$(HOST_ISL).$(HOST_ISL_SUFFIX)
-HOST_ISL_DIR		:= $(HOST_BUILDDIR)/$(HOST_ISL)
-HOST_ISL_LICENSE	:= MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_ISL_CONF_TOOL	:= autoconf
-HOST_ISL_CONF_OPT	:= \
-	$(PTX_HOST_AUTOCONF) \
-	--enable-portable-binary \
-	--disable-shared \
-	--enable-static \
-	--with-int=gmp \
-	--with-gmp=system \
-	--without-clang
-
-# vim: syntax=make
diff --git a/rules/host-system-isl.in b/rules/host-system-isl.in
new file mode 100644
index 0000000..29e00c7
--- /dev/null
+++ b/rules/host-system-isl.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEM_ISL
+	tristate
diff --git a/rules/host-system-isl.make b/rules/host-system-isl.make
new file mode 100644
index 0000000..6ff580d
--- /dev/null
+++ b/rules/host-system-isl.make
@@ -0,0 +1,23 @@
+# -*-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_ISL) += host-system-isl
+HOST_SYSTEM_ISL_LICENSE	:= ignore
+
+$(STATEDIR)/host-system-isl.prepare:
+	@$(call targetinfo)
+	@echo "Checking for isl ..."
+	@echo "#include <isl/version.h>" | $(HOSTCC) -x c -c -o /dev/null - 2>/dev/null || \
+		ptxd_bailout "isl development files not found!" \
+		"Please install libisl-dev (debian)"
+	@$(call touch)
+
+# vim: syntax=make