Mercurial > mxe-octave

changeset 2648:c740cf4f85e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package boost
author Mark Brand <mabrand@mabrand.nl>
date Sun, 01 Jul 2012 20:19:16 +0200
parents 0c267ecd6ee6
children 7e38c2c1bafe
files index.html src/boost.mk
diffstat 2 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Thu Jun 28 22:10:53 2012 +0200
+++ b/index.html	Sun Jul 01 20:19:16 2012 +0200
@@ -955,7 +955,7 @@
     </tr>
     <tr>
         <td id="boost-package">boost</td>
-        <td id="boost-version">1.49.0</td>
+        <td id="boost-version">1.50.0</td>
         <td id="boost-website"><a href="http://www.boost.org/">Boost C++ Library</a></td>
     </tr>
     <tr>
--- a/src/boost.mk	Thu Jun 28 22:10:53 2012 +0200
+++ b/src/boost.mk	Sun Jul 01 20:19:16 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := boost
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 26a52840e9d12f829e3008589abf0a925ce88524
+$(PKG)_CHECKSUM := ee06f89ed472cf369573f8acf9819fbc7173344e
 $(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)
@@ -17,9 +17,9 @@
 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 ;' > '$(1)/user-config.jam'
-    # make the build script generate .a library files instead of .lib
-    $(SED) -i 's,<target-os>windows : lib ;,<target-os>windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam'
     # compile boost jam
     cd '$(1)/tools/build/v2/engine' && ./build.sh
     cd '$(1)' && tools/build/v2/engine/bin.*/bjam \
@@ -45,5 +45,8 @@
         -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \
         -DBOOST_THREAD_USE_LIB \
-        -lboost_serialization-mt -lboost_thread_win32-mt
+        -lboost_serialization-mt \
+        -lboost_thread_win32-mt \
+        -lboost_system-mt \
+        -lboost_chrono-mt
 endef