boost: Update to 1.69.0

This commit is contained in:
Alexey Pavlov
2018-12-13 14:26:19 +03:00
parent 36781547ed
commit 233c8b3f5b
3 changed files with 3 additions and 60 deletions

View File

@@ -3,9 +3,9 @@
_realname=boost
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.68.0
pkgver=1.69.0
_boostver=${pkgver//./_}
pkgrel=2
pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
arch=('any')
url="https://www.boost.org/"
@@ -29,11 +29,9 @@ source=(https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.t
boost-1.57.0-python-abi_letters.patch
boost-1.57.0-python-libpython_dep.patch
boost-1.60.0-mingw-context.patch
boost-1.61.0-fix-undefined-referense-to-codecvt.patch
boost-include-intrin-h-on-mingw-w64.patch
using-mingw-w64-python.patch
msys2-mingw-folders-bootstrap.patch)
sha256sums=('7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7'
sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406'
'c5eae6354693c6b4e6364d4cf6f06c6c3de4c28486bf812cbd291f4410126cf8'
'8d048e8ecee8b7feaa8651d6bc65d63838df240626619a4fb8738512043c3eb1'
'4551ba9edf64c8ccdab4f4890c20e2e8cf6d4ffa1169d251df11e30d25b886b8'
@@ -44,8 +42,6 @@ sha256sums=('7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7'
'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
'01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c'
'9ac0fc0306114d709958ae6e17fdd38616fa7c352d10346f099b51ef49d0ec4e'
'2d5a82277f271612421f05c3b1a1e55fe736a18b581920eea12b54767d74edad'
'9a269375b8eb262b93fb18ea6b2ac8c97b16fb71b8bab900faa4c2df2816f2eb'
'0dd6346d369850aad13bf8d9bc2f0abc16d4b0586e34d61fab11f65d3d7fa9d4'
'81f74c2eafbe004bcbb863cc3cd74571adcffed1169dde86645db4441be236e1')
@@ -91,15 +87,6 @@ prepare() {
msg2 "boost-1.60.0-mingw-context.patch"
patch -p1 -i ${srcdir}/boost-1.60.0-mingw-context.patch
# https://svn.boost.org/trac/boost/ticket/12205
msg2 "boost-1.61.0-fix-undefined-referense-to-codecvt.patch"
patch -p1 -i ${srcdir}/boost-1.61.0-fix-undefined-referense-to-codecvt.patch
# Fix FTBFS on recent mingw-w64 and also use intrinsics based
# versions of the Interlocked symbols which are better optimized
msg2 "boost-include-intrin-h-on-mingw-w64.patch"
patch -p0 -i ${srcdir}/boost-include-intrin-h-on-mingw-w64.patch
# Use our own build Python
msg2 "using-mingw-w64-python.patch"
patch -p1 -i ${srcdir}/using-mingw-w64-python.patch

View File

@@ -1,30 +0,0 @@
From aab8477eb1456896bf7311e913fb9b20b5f5e335 Mon Sep 17 00:00:00 2001
From: xantares <xantares09@hotmail.com>
Date: Sat, 14 May 2016 16:16:51 +0200
Subject: [PATCH] Fix undefined reference to codecvt_null<wchar_t>
See https://svn.boost.org/trac/boost/ticket/12205
---
libs/serialization/build/Jamfile.v2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/serialization/build/Jamfile.v2 b/libs/serialization/build/Jamfile.v2
index 8fd92e6..cb17dd5 100644
--- a/libs/serialization/build/Jamfile.v2
+++ b/libs/serialization/build/Jamfile.v2
@@ -80,7 +80,6 @@ SOURCES =
xml_iarchive
xml_oarchive
xml_archive_exception
- codecvt_null
utf8_codecvt_facet
singleton
;
@@ -93,6 +92,7 @@ WSOURCES =
xml_wgrammar
xml_wiarchive
xml_woarchive
+ codecvt_null
;
lib boost_serialization

View File

@@ -1,14 +0,0 @@
--- boost/detail/interlocked.hpp.interlocked 2012-12-11 15:42:26.000000000 +0100
+++ boost/detail/interlocked.hpp 2013-07-21 15:22:56.082346444 +0200
@@ -92,9 +92,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 >= 1400
+#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1400 ) || defined( __MINGW64_VERSION_MAJOR )
#include <intrin.h>