diff options
-rw-r--r-- | src/boost-1-intrinsics-fix.patch | 37 | ||||
-rw-r--r-- | src/boost-2-winerror.patch | 17 | ||||
-rw-r--r-- | src/boost.mk | 15 |
3 files changed, 9 insertions, 60 deletions
diff --git a/src/boost-1-intrinsics-fix.patch b/src/boost-1-intrinsics-fix.patch deleted file mode 100644 index 81a19ba..0000000 --- a/src/boost-1-intrinsics-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://pkgs.fedoraproject.org/cgit/mingw-boost.git/plain/boost-include-intrin-h-on-mingw-w64.patch - ---- a/boost/detail/interlocked.hpp.interlocked 2012-12-11 15:42:26.000000000 +0100 -+++ b/boost/detail/interlocked.hpp 2013-07-21 15:22:56.082346444 +0200 -@@ -69,9 +69,9 @@ - # define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \ - ((void*)BOOST_INTERLOCKED_EXCHANGE((long*)(dest),(long)(exchange))) - --#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) -+#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) || defined( __MINGW64_VERSION_MAJOR ) - --#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1600 -+#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1600 ) || defined( __MINGW64_VERSION_MAJOR ) - - #include <intrin.h> - -@@ -93,12 +93,16 @@ - - #endif - -+# if defined( BOOST_MSVC ) -+ - # pragma intrinsic( _InterlockedIncrement ) - # pragma intrinsic( _InterlockedDecrement ) - # pragma intrinsic( _InterlockedCompareExchange ) - # pragma intrinsic( _InterlockedExchange ) - # pragma intrinsic( _InterlockedExchangeAdd ) - -+# endif -+ - # if defined(_M_IA64) || defined(_M_AMD64) - - extern "C" void* __cdecl _InterlockedCompareExchangePointer( void* volatile *, void*, void* ); diff --git a/src/boost-2-winerror.patch b/src/boost-2-winerror.patch deleted file mode 100644 index d9b03ea..0000000 --- a/src/boost-2-winerror.patch +++ /dev/null @@ -1,17 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Fix WinError.h capitalization. See http://svn.boost.org/trac/boost/ticket/7081 - -diff -ur a/boost/detail/win/basic_types.hpp b/boost/detail/win/basic_types.hpp ---- a/boost/detail/win/basic_types.hpp 2011-03-25 02:20:55.000000000 +0100 -+++ b/boost/detail/win/basic_types.hpp 2013-11-13 18:59:00.225614699 +0100 -@@ -14,7 +14,7 @@ - #if defined( BOOST_USE_WINDOWS_H ) - # include <windows.h> - #elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) --# include <WinError.h> -+# include <winerror.h> - // @FIXME Which condition must be tested - # ifdef UNDER_CE - # ifndef WINAPI 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' \ |