Mercurial > mxe-octave

diff src/boost.mk @ 3642:5a459f007b2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
boost: update to 1.53.0 * src/boost.mk: update to 1.53.0 * src/boost-1-intrinsics-fix.patch: new file from mxe_devel * src/boost-2-winerror.patch: new file from mxe-devel * dist-files.mk: add boost-1-intrinsics-fix.patch boost-2-winerror.patch
author John Donoghue
date Tue, 01 Jul 2014 09:11:16 -0400
parents 13be64f9f16d
children 979f5b397e51
line wrap: on
line diff
--- a/src/boost.mk	Tue Jul 01 09:48:50 2014 -0400
+++ b/src/boost.mk	Tue Jul 01 09:11:16 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := boost
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.52.0
-$(PKG)_CHECKSUM := cddd6b4526a09152ddc5db856463eaa1dc29c5d9
+$(PKG)_VERSION  := 1.53.0
+$(PKG)_CHECKSUM := e6dd1b62ceed0a51add3dda6f3fc3ce0f636a7f3
 $(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)
@@ -21,8 +21,8 @@
     # context switched library introduced in boost 1.51.0 does not build
     rm -r '$(1)/libs/context'
     # old version appears to interfere
-    rm -rf '$(HOST_INCDIR)/boost'
-    echo 'using gcc : : $(MXE_CXX) : <rc>$(MXE_WINDRES) <archiver>$(MXE_AR) ;' > '$(1)/user-config.jam'
+    rm -rf '$(HOST_INCDIR)/boost/'
+    echo 'using gcc : : $(MXE_CXX) : <rc>$(MXE_WINDRES) <archiver>$(MXE_AR) <ranlib>$(MXE_RANDLIB) ;' > '$(1)/user-config.jam'
     # compile boost jam
     cd '$(1)/tools/build/v2/engine' && ./build.sh
     cd '$(1)' && tools/build/v2/engine/bin.*/bjam \
@@ -31,9 +31,10 @@
         --user-config=user-config.jam \
         target-os=windows \
         threading=multi \
-        link=static \
+        link=$(if $(filter $(BUILD_STATIC),,yes),static,shared) \
         threadapi=win32 \
         --layout=tagged \
+        --disable-icu \
         --without-mpi \
         --without-python \
         --prefix='$(HOST_PREFIX)' \
@@ -44,9 +45,9 @@
         -sEXPAT_LIBPATH='$(HOST_LIBDIR)' \
         stage install
 
-    '$(MXE_CXX)' \
+    '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
-        '$(2).cpp' -o '$(HOST_BINDIR)/test-boost.exe' \
+        '$(2).cpp' -o '$(1)/test-boost.exe' \
         -DBOOST_THREAD_USE_LIB \
         -lboost_serialization-mt \
         -lboost_thread_win32-mt \