diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-12-01 12:43:14 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-12-01 12:43:14 (GMT) |
| commit | fc36ca160af70952dd320f0cc185f8eb6c43df2e (patch) | |
| tree | 365d221f1851767c67c397bb578b7633bebbed0c /src/boost.mk | |
| parent | 6d28d3748550bce3200010553d7ada43640c0684 (diff) | |
| download | mxe-fc36ca160af70952dd320f0cc185f8eb6c43df2e.zip mxe-fc36ca160af70952dd320f0cc185f8eb6c43df2e.tar.gz mxe-fc36ca160af70952dd320f0cc185f8eb6c43df2e.tar.bz2 | |
boost: update
breaks luabind but all other deps (armadillo assimp cgal json_spirit openscenegraph pcl wt xmlwrapp) okay
Diffstat (limited to 'src/boost.mk')
| -rw-r--r-- | src/boost.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/boost.mk b/src/boost.mk index 3622aa8..54dece2 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -3,8 +3,8 @@ PKG := boost $(PKG)_IGNORE := -$(PKG)_VERSION := 1.53.0 -$(PKG)_CHECKSUM := e6dd1b62ceed0a51add3dda6f3fc3ce0f636a7f3 +$(PKG)_VERSION := 1.57.0 +$(PKG)_CHECKSUM := e151557ae47afd1b43dc3fac46f8b04a8fe51c12 $(PKG)_SUBDIR := boost_$(subst .,_,$($(PKG)_VERSION)) $(PKG)_FILE := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -18,25 +18,28 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # context switched library introduced in boost 1.51.0 does not build - rm -r '$(1)/libs/context' # old version appears to interfere rm -rf '$(PREFIX)/$(TARGET)/include/boost/' echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar <ranlib>$(TARGET)-ranlib ;' > '$(1)/user-config.jam' # compile boost jam - cd '$(1)/tools/build/v2/engine' && ./build.sh - cd '$(1)' && tools/build/v2/engine/bin.*/bjam \ + cd '$(1)/tools/build/' && ./bootstrap.sh + $(SED) -i 's, as , $(TARGET)-as ,g' '$(1)/libs/context/build/Jamfile.v2' + $(SED) -i 's, cpp , $(TARGET)-cpp ,g' '$(1)/libs/context/build/Jamfile.v2' + cd '$(1)' && ./tools/build/b2 \ -j '$(JOBS)' \ --ignore-site-config \ --user-config=user-config.jam \ + toolset=gcc \ target-os=windows \ threading=multi \ link=$(if $(BUILD_STATIC),static,shared) \ threadapi=win32 \ --layout=tagged \ --disable-icu \ + --without-context \ --without-mpi \ --without-python \ + --build-dir='$(1).build' \ --prefix='$(PREFIX)/$(TARGET)' \ --exec-prefix='$(PREFIX)/$(TARGET)/bin' \ --libdir='$(PREFIX)/$(TARGET)/lib' \ |