replace host-xz with host-system-xz

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.

xz (liblzma) 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>

5 files changed, 32 insertions, 67 deletions

diff --git a/rules/cross-gdb.in b/rules/cross-gdb.in
index d12dc80..6ba09f3 100644
--- a/rules/cross-gdb.in
+++ b/rules/cross-gdb.in
@@ -4,7 +4,7 @@ menuconfig CROSS_GDB
 	select HOST_SYSTEM_EXPAT
 	select HOST_SYSTEM_GMP
 	select HOST_SYSTEM_ZLIB
-	select HOST_XZ
+	select HOST_SYSTEM_XZ
 	help
 	GDB is a source-level debugger, capable of breaking programs
 	at any specific line, displaying variable values, and
diff --git a/rules/host-system-xz.in b/rules/host-system-xz.in
new file mode 100644
index 0000000..487d9f1
--- /dev/null
+++ b/rules/host-system-xz.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEM_XZ
+	tristate
diff --git a/rules/host-system-xz.make b/rules/host-system-xz.make
new file mode 100644
index 0000000..3de62c8
--- /dev/null
+++ b/rules/host-system-xz.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_XZ) += host-system-xz
+HOST_SYSTEM_XZ_LICENSE	:= ignore
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-system-xz.prepare:
+	@$(call targetinfo)
+	@echo "Checking for expat ..."
+	@pkg-config liblzma || \
+		ptxd_bailout "xz (lzma) development files not found!" \
+		"Please install liblzma-dev (debian)"
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/host-xz.in b/rules/host-xz.in
deleted file mode 100644
index d643811..0000000
--- a/rules/host-xz.in
+++ /dev/null
@@ -1,4 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_XZ
-	bool
diff --git a/rules/host-xz.make b/rules/host-xz.make
deleted file mode 100644
index 99ea1bf..0000000
--- a/rules/host-xz.make
+++ /dev/null
@@ -1,62 +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_XZ) += host-xz
-
-#
-# Paths and names
-#
-HOST_XZ_VERSION	:= 5.2.5
-HOST_XZ_MD5	:= 33ab3ef79aa1146b83b778210e7b0a54
-HOST_XZ		:= xz-$(HOST_XZ_VERSION)
-HOST_XZ_SUFFIX	:= tar.bz2
-HOST_XZ_URL	:= http://tukaani.org/xz/$(HOST_XZ).$(HOST_XZ_SUFFIX)
-HOST_XZ_SOURCE	:= $(SRCDIR)/$(HOST_XZ).$(HOST_XZ_SUFFIX)
-HOST_XZ_DIR	:= $(HOST_BUILDDIR)/$(HOST_XZ)
-HOST_XZ_LICENSE	:= public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later
-HOST_XZ_LICENSE_FILES := \
-	file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \
-	file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-	file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_XZ_CONF_TOOL	:= autoconf
-HOST_XZ_CONF_OPT	:= \
-	$(PTX_HOST_AUTOCONF) \
-	--disable-debug \
-	--disable-external-sha256 \
-	--enable-assembler \
-	--disable-small \
-	--enable-threads \
-	--disable-xz \
-	--disable-xzdec \
-	--disable-lzmadec \
-	--disable-lzmainfo \
-	--disable-lzma-links \
-	--disable-scripts \
-	--disable-doc \
-	--enable-symbol-versions \
-	--disable-sandbox \
-	--disable-shared \
-	--enable-static \
-	--disable-nls \
-	--disable-rpath \
-	--enable-unaligned-access=auto \
-	--disable-werror
-
-# vim: syntax=make