summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
Diffstat (limited to 'rules')
-rw-r--r--rules/cross-gdb.in2
-rw-r--r--rules/host-expat.in4
-rw-r--r--rules/host-expat.make42
-rw-r--r--rules/host-system-expat.in4
-rw-r--r--rules/host-system-expat.make27
5 files changed, 32 insertions, 47 deletions
diff --git a/rules/cross-gdb.in b/rules/cross-gdb.in
index bfe5f04..07a8f7d 100644
--- a/rules/cross-gdb.in
+++ b/rules/cross-gdb.in
@@ -1,7 +1,7 @@
menuconfig CROSS_GDB
bool "cross gdb "
select HOST_SYSTEM_PYTHON3
- select HOST_EXPAT
+ select HOST_SYSTEM_EXPAT
select HOST_SYSTEM_GMP
select HOST_ZLIB
select HOST_XZ
diff --git a/rules/host-expat.in b/rules/host-expat.in
deleted file mode 100644
index 9f4bf0a..0000000
--- a/rules/host-expat.in
+++ /dev/null
@@ -1,4 +0,0 @@
-## SECTION=hosttools_noprompt
-
-config HOST_EXPAT
- bool
diff --git a/rules/host-expat.make b/rules/host-expat.make
deleted file mode 100644
index 6c5b1d9..0000000
--- a/rules/host-expat.make
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 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_EXPAT) += host-expat
-
-#
-# Paths and names
-#
-HOST_EXPAT_VERSION := 2.2.9
-HOST_EXPAT_MD5 := 875a2c2ff3e8eb9e5a5cd62db2033ab5
-HOST_EXPAT := expat-$(HOST_EXPAT_VERSION)
-HOST_EXPAT_SUFFIX := tar.bz2
-HOST_EXPAT_URL := $(call ptx/mirror, SF, expat/$(HOST_EXPAT).$(HOST_EXPAT_SUFFIX))
-HOST_EXPAT_SOURCE := $(SRCDIR)/$(HOST_EXPAT).$(HOST_EXPAT_SUFFIX)
-HOST_EXPAT_DIR := $(HOST_BUILDDIR)/$(HOST_EXPAT)
-HOST_EXPAT_LICENSE := MIT
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_EXPAT_CONF_TOOL := autoconf
-HOST_EXPAT_CONF_OPT := \
- $(PTX_HOST_AUTOCONF) \
- --disable-shared \
- --enable-static \
- --enable-xml-context \
- --without-xmlwf \
- --without-libbsd
-
-# vim: syntax=make
diff --git a/rules/host-system-expat.in b/rules/host-system-expat.in
new file mode 100644
index 0000000..88d82c3
--- /dev/null
+++ b/rules/host-system-expat.in
@@ -0,0 +1,4 @@
+## SECTION=hosttools_noprompt
+
+config HOST_SYSTEM_EXPAT
+ tristate
diff --git a/rules/host-system-expat.make b/rules/host-system-expat.make
new file mode 100644
index 0000000..f53f129
--- /dev/null
+++ b/rules/host-system-expat.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_EXPAT) += host-system-expat
+HOST_SYSTEM_EXPAT_LICENSE := ignore
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/host-system-expat.prepare:
+ @$(call targetinfo)
+ @echo "Checking for expat ..."
+ @pkg-config expat || \
+ ptxd_bailout "expat development files not found!" \
+ "Please install libexpat1-dev (debian)"
+ @$(call touch)
+
+# vim: syntax=make