boost: cleanup rules

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

1 files changed, 16 insertions, 68 deletions

diff --git a/rules/boost.make b/rules/boost.make
index c89393c81..5797aefc6 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -30,19 +30,6 @@ BOOST_LICENSE	:= BSL-1.0
 # Prepare
 # ----------------------------------------------------------------------------
 
-ifneq ($(PTXCONF_BOOST_INST_NOMT_DBG)$(PTXCONF_BOOST_INST_MT_DBG),)
-JAM_LIB_DEBUG	:= debug
-endif
-ifneq ($(PTXCONF_BOOST_INST_NOMT_RED)$(PTXCONF_BOOST_INST_MT_RED),)
-JAM_LIB_RELEASE	:= release
-endif
-ifneq ($(PTXCONF_BOOST_INST_NOMT_DBG)$(PTXCONF_BOOST_INST_NOMT_RED),)
-JAM_LIB_SINGLE	:= single
-endif
-ifneq ($(PTXCONF_BOOST_INST_MT_DBG)$(PTXCONF_BOOST_INST_MT_RED),)
-JAM_LIB_MULTI	:= multi
-endif
-
 BOOST_ABI	:= sysv
 ifneq ($(PTXCONF_ARCH_ARM)$(PTXCONF_ARCH_ARM64),)
 BOOST_ARCH	:= arm
@@ -60,15 +47,18 @@ endif
 # -d: debug level, default=1
 BOOST_JAM	:= \
 	$(BOOST_DIR)/b2 \
+	--ignore-site-config \
 	--user-config=user-config.jam \
 	-q \
 	$$(if $$(filter 0,$$(PTXDIST_VERBOSE)),-d0) \
-	--layout=tagged \
+	--layout=system \
 	-sNO_BZIP2=0 \
 	-sZLIB_INCLUDE=$(SYSROOT)/usr/include \
 	-sZLIB_LIBPATH=$(SYSROOT)/usr/lib \
-	variant=$(subst $(space),$(comma),$(strip $(JAM_LIB_DEBUG) $(JAM_LIB_RELEASE))) \
-	threading=$(subst $(space),$(comma),$(strip $(JAM_LIB_SINGLE) $(JAM_LIB_MULTI))) \
+	--$(call ptx/wwo, PTXCONF_BOOST_MPI)-mpi \
+	variant=release \
+	debug-symbols=on \
+	threading=multi \
 	link=shared \
 	toolset=gcc-$(PTXCONF_ARCH_STRING) \
 	target-os=linux \
@@ -119,6 +109,7 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_SYSTEM)		+= system
 BOOST_LIBRARIES-$(PTXCONF_BOOST_TEST)		+= test
 BOOST_LIBRARIES-$(PTXCONF_BOOST_THREAD)		+= thread
 BOOST_LIBRARIES-$(PTXCONF_BOOST_TIMER)		+= timer
+BOOST_LIBRARIES-$(PTXCONF_BOOST_TYPE_ERASURE)	+= type_erasure
 BOOST_LIBRARIES-$(PTXCONF_BOOST_WAVE)		+= wave
 
 BOOST_PATH	:= PATH=$(CROSS_PATH)
@@ -132,16 +123,16 @@ BOOST_CONF_OPT	:= \
 $(STATEDIR)/boost.prepare:
 	@$(call targetinfo)
 	cd $(BOOST_DIR) && ./bootstrap.sh $(BOOST_CONF_OPT)
-	@cd $(BOOST_DIR) && \
-		echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam
+	@echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam
+ifdef PTXCONF_BOOST_MPI
+	@echo "using mpi ;" >> $(BOOST_DIR)/user-config.jam
+endif
 
 ifdef PTXCONF_BOOST_PYTHON3
-	@cd $(BOOST_DIR) && \
-		echo "using python : $(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+	@echo "using python : $(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
 endif
 ifdef PTXCONF_BOOST_PYTHON2
-	@cd $(BOOST_DIR) && \
-		echo "using python : $(PYTHON_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+	@echo "using python : $(PYTHON_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
 endif
 
 	@echo "all:"					>  $(BOOST_DIR)/Makefile
@@ -165,60 +156,17 @@ endif
 $(STATEDIR)/boost.targetinstall:
 	@$(call targetinfo)
 
+ifdef PTXCONF_BOOST_LIBS
 	@$(call install_init, boost)
 	@$(call install_fixup, boost,PRIORITY,optional)
 	@$(call install_fixup, boost,SECTION,base)
 	@$(call install_fixup, boost,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, boost,DESCRIPTION,missing)
 
-# iterate for selected libraries
-# trim whitespaces added by make and go for single .so files depending on which
-# kind of binaries we want to install
-	@for BOOST_LIB in $(BOOST_INST_LIBRARIES); do \
-		read BOOST_LIB <<< $$BOOST_LIB; \
-		if [ ! -z $(PTXCONF_BOOST_INST_NOMT_DBG) ]; then \
-			for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \
-				 -type f -name "*-d*" ! -name "*-mt*"`; do \
-				$(call install_copy, boost, 0, 0, 0644, -,\
-					/usr/lib/$$(basename $$SO_FILE)); \
-				$(call install_link, boost, \
-					$$(basename $$SO_FILE), \
-					/usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \
-			done; \
-		fi; \
-		if [ ! -z $(PTXCONF_BOOST_INST_NOMT_RED) ]; then \
-			for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \
-				 -type f ! -name "*-d*" ! -name "*-mt*"`; do \
-				$(call install_copy, boost, 0, 0, 0644, -,\
-					/usr/lib/$$(basename $$SO_FILE)); \
-				$(call install_link, boost, \
-					$$(basename $$SO_FILE), \
-					/usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \
-			done; \
-		fi; \
-		if [ ! -z $(PTXCONF_BOOST_INST_MT_DBG) ]; then \
-			for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \
-				  -type f -name "*-d*" -name "*-mt*"`; do \
-				$(call install_copy, boost, 0, 0, 0644, -,\
-					/usr/lib/$$(basename $$SO_FILE)); \
-				$(call install_link, boost, \
-					$$(basename $$SO_FILE), \
-					/usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \
-			done; \
-		fi; \
-		if [ ! -z $(PTXCONF_BOOST_INST_MT_RED) ]; then \
-			for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \
-				 -type f ! -name "*-d*" -name "*-mt*"`; do \
-				$(call install_copy, boost, 0, 0, 0644, -,\
-					/usr/lib/$$(basename $$SO_FILE)); \
-				$(call install_link, boost, \
-					$$(basename $$SO_FILE), \
-					/usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \
-			done; \
-		fi; \
-	done
+	@$(call install_glob, boost, 0, 0, -, /usr/lib, */libboost*.so*)
 
 	@$(call install_finish, boost)
+endif
 
 	@$(call touch)