diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-02 14:13:40 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-03 22:28:37 +0100 |
| commit | d8890093711ac3db6dc3f13973c12ddddedb37ab (patch) | |
| tree | 0c12bbef431005192dfde16d3672e5e785be6947 /rules/boost.make | |
| parent | b72f81162931dfd3864f1be3aa6ff8f58f7c23ee (diff) | |
| download | ptxdist-d8890093711ac3db6dc3f13973c12ddddedb37ab.tar.gz ptxdist-d8890093711ac3db6dc3f13973c12ddddedb37ab.tar.xz | |
boost: version bump 1_55_0 -> 1_59_0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/boost.make')
| -rw-r--r-- | rules/boost.make | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/rules/boost.make b/rules/boost.make index 17835e3d8..a1c4d17cf 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_BOOST) += boost # # Paths and names # -BOOST_VERSION := 1_55_0 -BOOST_MD5 := d6eef4b4cacb2183f2bf265a5a03a354 +BOOST_VERSION := 1_59_0 +BOOST_MD5 := 6aa9a5c6a4ca1016edd0ed1178e3cb87 BOOST := boost_$(BOOST_VERSION) BOOST_SUFFIX := tar.bz2 BOOST_URL := $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX)) @@ -43,6 +43,18 @@ 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 +BOOST_ABI := aapcs +endif +ifdef PTXCONF_ARCH_X86 +BOOST_ARCH := x86 +endif +ifdef PTXCONF_ARCH_PPC +BOOST_ARCH := power +endif + # they reinvent their own wheel^Hmake: jam # -q: quit on error # -d: debug level, default=1 @@ -50,7 +62,7 @@ BOOST_JAM := \ $(BOOST_DIR)/b2 \ --user-config=user-config.jam \ -q \ - -d0 \ + $$(if $$(filter 0,$$(PTXDIST_VERBOSE)),-d0) \ --layout=tagged \ -sNO_BZIP2=0 \ -sZLIB_INCLUDE=$(SYSROOT)/usr/include \ @@ -59,7 +71,11 @@ BOOST_JAM := \ threading=$(subst $(space),$(comma),$(strip $(JAM_LIB_SINGLE) $(JAM_LIB_MULTI))) \ link=shared \ toolset=gcc-$(PTXCONF_ARCH_STRING) \ - target-os=linux + target-os=linux \ + abi=$(BOOST_ABI) \ + binary-format=elf \ + architecture=$(BOOST_ARCH) \ + address-model=$(call ptx/ifdef, ARCH_LP64,64,32) JAM_PAR := \ $(if $(PTXDIST_PARALLELMFLAGS),$(PTXDIST_PARALLELMFLAGS),$(PARALLELMFLAGS)) @@ -78,8 +94,10 @@ BOOST_LIBRARIES-y := date_time BOOST_LIBRARIES-$(PTXCONF_BOOST_ATOMIC) += atomic BOOST_LIBRARIES-$(PTXCONF_BOOST_CHRONO) += chrono +BOOST_LIBRARIES-$(PTXCONF_BOOST_CONTAINER) += container BOOST_LIBRARIES-$(PTXCONF_BOOST_CONTEXT) += context BOOST_LIBRARIES-$(PTXCONF_BOOST_COROUTINE) += coroutine +BOOST_LIBRARIES-$(PTXCONF_BOOST_COROUTINE2) += coroutine2 BOOST_LIBRARIES-$(PTXCONF_BOOST_DATE_TIME) += date_time BOOST_LIBRARIES-$(PTXCONF_BOOST_EXCEPTION) += exception BOOST_LIBRARIES-$(PTXCONF_BOOST_FILESYSTEM) += filesystem @@ -116,9 +134,9 @@ $(STATEDIR)/boost.prepare: @cd $(BOOST_DIR) && \ echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam @echo "all:" > $(BOOST_DIR)/Makefile - @echo " @$(BOOST_JAM) $(JAM_MAKE_OPT)" >> $(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 + @echo ' @$(BOOST_JAM) $(JAM_INSTALL_OPT)' >> $(BOOST_DIR)/Makefile @$(call touch) # ---------------------------------------------------------------------------- |