diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-12-05 10:48:18 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-12-05 10:48:18 (GMT) |
| commit | 37c3c01025b2f5f031281764ec8af4ee882287b9 (patch) | |
| tree | 46d9d6ac4e797d4eb9331fb1977f05dcf6e6be60 /src/boost.mk | |
| parent | 011a8351e87264f9cdda75f8d7f140a2fbe900d5 (diff) | |
| download | mxe-37c3c01025b2f5f031281764ec8af4ee882287b9.zip mxe-37c3c01025b2f5f031281764ec8af4ee882287b9.tar.gz mxe-37c3c01025b2f5f031281764ec8af4ee882287b9.tar.bz2 | |
boost: fixes for v1.57 update
Diffstat (limited to 'src/boost.mk')
| -rw-r--r-- | src/boost.mk | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/boost.mk b/src/boost.mk index 54dece2..e8b5f9c 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -20,33 +20,43 @@ endef define $(PKG)_BUILD # 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 + rm -f "$(PREFIX)/$(TARGET)/lib/libboost*" + + # create user-config + echo 'using gcc : mxe : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar <ranlib>$(TARGET)-ranlib ;' > '$(1)/user-config.jam' + + # compile boost build (b2) 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' + + # cross-build, see b2 options at: + # http://www.boost.org/build/doc/html/bbv2/overview/invocation.html cd '$(1)' && ./tools/build/b2 \ + -a \ + -q \ -j '$(JOBS)' \ --ignore-site-config \ --user-config=user-config.jam \ - toolset=gcc \ - target-os=windows \ - threading=multi \ + address-model=$(BITS) \ + architecture=x86 \ + binary-format=pe \ link=$(if $(BUILD_STATIC),static,shared) \ + runtime-link=$(if $(BUILD_STATIC),static,shared) \ + target-os=windows \ threadapi=win32 \ + threading=multi \ + toolset=gcc-mxe \ --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' \ --includedir='$(PREFIX)/$(TARGET)/include' \ -sEXPAT_INCLUDE='$(PREFIX)/$(TARGET)/include' \ -sEXPAT_LIBPATH='$(PREFIX)/$(TARGET)/lib' \ - stage install + cxxflags='-std=c++11' \ + install $(if $(BUILD_SHARED), \ mv -fv '$(PREFIX)/$(TARGET)/lib/'libboost_*.dll '$(PREFIX)/$(TARGET)/bin/') |