diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-26 18:12:56 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-26 18:13:44 +0100 |
| commit | 97c0fed17c3e4db5d75483fff5b693d606cde775 (patch) | |
| tree | bdc0dd3d69cf9155efab96659c3f4ab9d6b25dd6 /rules/boost.make | |
| parent | f4d61669e79ccb1214f2943e843b215b0881a532 (diff) | |
| download | ptxdist-97c0fed17c3e4db5d75483fff5b693d606cde775.tar.gz ptxdist-97c0fed17c3e4db5d75483fff5b693d606cde775.tar.xz | |
[boost] version bump 1_38_0 -> 1_41_0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/boost.make')
| -rw-r--r-- | rules/boost.make | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/rules/boost.make b/rules/boost.make index add03ad29..9288eb220 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BOOST) += boost # # Paths and names # -BOOST_VERSION := 1_38_0 +BOOST_VERSION := 1_41_0 BOOST := boost_$(BOOST_VERSION) BOOST_SUFFIX := tar.bz2 BOOST_URL := $(PTXCONF_SETUP_SFMIRROR)/boost/$(BOOST).$(BOOST_SUFFIX) @@ -36,21 +36,42 @@ $(BOOST_SOURCE): # 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 + # they reinvent their own wheel^Hmake: jam # -q: quit on error # -d: debug level, default=1 BOOST_JAM := \ - $(BOOST_DIR)/tools/jam/src/bjam \ - -d1 \ + $(BOOST_DIR)/bjam \ + --user-config=user-config.jam \ -q \ - --toolset=gcc \ + -d0 \ + --layout=tagged \ -sNO_BZIP2=0 \ -sZLIB_INCLUDE=$(SYSROOT)/usr/include \ -sZLIB_LIBPATH=$(SYSROOT)/usr/lib \ - variant=debug,profile \ - threading=single,multi \ + variant=$(subst $(space),$(comma),$(strip $(JAM_LIB_DEBUG) $(JAM_LIB_RELEASE))) \ + threading=$(subst $(space),$(comma),$(strip $(JAM_LIB_SINGLE) $(JAM_LIB_MULTI))) \ link=shared +JAM_MAKE_OPT := \ + $(PARALLELMFLAGS) \ + stage + +JAM_INSTALL_OPT := \ + install + # boost doesn't provide "no library" choice. If the library list is empty, it # goes for all libraries. We start at least with date_time lib here to avoid # this @@ -67,30 +88,23 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_WAVE) += wave BOOST_LIBRARIES-$(PTXCONF_BOOST_TEST) += test BOOST_LIBRARIES-$(PTXCONF_BOOST_GRAPH) += graph -BOOST_CONF_TOOL := autoconf +BOOST_PATH := PATH=$(CROSS_PATH) +BOOST_CONF_TOOL := NO BOOST_CONF_OPT := \ - --with-bjam="$(BOOST_JAM)" \ + --with-toolset=gcc \ --prefix="$(PKGDIR)/$(BOOST)/usr" \ --with-libraries="$(subst $(space),$(comma),$(BOOST_LIBRARIES-y))" \ --without-icu $(STATEDIR)/boost.prepare: @$(call targetinfo) - @cd $(BOOST_DIR)/tools/jam/src && \ - sh build.sh gcc && mv bin.*/bjam . - @$(call world/prepare, BOOST) - cd $(BOOST_DIR) && \ - echo "using gcc : `PATH=$(CROSS_PATH) $(CROSS_CXX) -dumpversion` : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/boost.install: - @$(call targetinfo) - @$(call install, BOOST) - @find $(SYSROOT) -name boost -type d -exec cp -a {} $(SYSROOT)/usr/include \;; + cd $(BOOST_DIR) && ./bootstrap.sh $(BOOST_CONF_OPT) + @cd $(BOOST_DIR) && \ + echo "using gcc : `$(BOOST_PATH) $(CROSS_CXX) -dumpversion` : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam + @echo "all:" > $(BOOST_DIR)/Makefile + @echo " @$(BOOST_JAM) $(JAM_MAKE_OPT)" >> $(BOOST_DIR)/Makefile + @echo "install:" >> $(BOOST_DIR)/Makefile + @echo " @$(BOOST_JAM) $(JAM_INSTALL_OPT)" >> $(BOOST_DIR)/Makefile @$(call touch) # ---------------------------------------------------------------------------- |