[Buildroot] [PATCH 15/29 v2] pakcage/boost: make host variant slightly configurable

[Yann E. MORIN]

regex and system are currently not disabled, on the off-chance that
host-riscv-isa-sim is needed. But when it is not, this uselessly builds
regex and system...

Add options for those, and select them from host-riscv-isa-sim.

Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Cc: Julien Olivain <ju.o at free.fr>
Cc: Michael Nosthoff <buildroot at heine.tech>
Cc: Yegor Yefremov <yegorslists at googlemail.com>
---
 package/boost/Config.in.host         | 10 ++++++++++
 package/boost/boost.mk               |  6 ++++--
 package/riscv-isa-sim/Config.in.host |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/package/boost/Config.in.host b/package/boost/Config.in.host
index 5ffcbe6932..d377a8fbd8 100644
--- a/package/boost/Config.in.host
+++ b/package/boost/Config.in.host
@@ -1,2 +1,12 @@
 config BR2_PACKAGE_HOST_BOOST
 	bool
+
+if BR2_PACKAGE_HOST_BOOST
+
+config BR2_PACKAGE_HOST_BOOST_REGEX
+	bool
+
+config BR2_PACKAGE_HOST_BOOST_SYSTEM
+	bool
+
+endif
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 6af76e1302..95191476a8 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -39,8 +39,8 @@ HOST_BOOST_FLAGS = \
 	--without-icu \
 	--with-toolset=gcc
 
-# keep host variant as minimal as possible
-# regex & system are needed by host-riscv-isa-sim
+# keep host variant as minimal as possible, only add options when
+# an actual host package needs it.
 HOST_BOOST_WITHOUT_FLAGS = \
 	atomic \
 	chrono \
@@ -64,8 +64,10 @@ HOST_BOOST_WITHOUT_FLAGS = \
 	program_options \
 	python \
 	random \
+	$(if $(BR2_PACKAGE_HOST_BOOST_REGEX),,regex) \
 	serialization \
 	stacktrace \
+	$(if $(BR2_PACKAGE_HOST_BOOST_SYSTEM),,system) \
 	test \
 	thread \
 	timer \
diff --git a/package/riscv-isa-sim/Config.in.host b/package/riscv-isa-sim/Config.in.host
index eb28d5b063..60dc6823d8 100644
--- a/package/riscv-isa-sim/Config.in.host
+++ b/package/riscv-isa-sim/Config.in.host
@@ -2,6 +2,8 @@ config BR2_PACKAGE_HOST_RISCV_ISA_SIM
 	bool "host riscv-isa-sim"
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++11
 	select BR2_PACKAGE_HOST_BOOST
+	select BR2_PACKAGE_HOST_BOOST_REGEX
+	select BR2_PACKAGE_HOST_BOOST_SYSTEM
 	help
 	  Spike, the RISC-V ISA Simulator, implements a functional
 	  model of one or more RISC-V harts.
-- 
2.47.0