boost: update to 1.70.0

msys2 · Apr 12, 2019 · fd550b8 · fd550b8
1 parent 383ea0e
commit fd550b8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 8 deletions.
diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=boost
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.69.0
+pkgver=1.70.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=1
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 url="https://www.boost.org/"
@@ -30,20 +30,22 @@ source=(https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.t
         boost-1.57.0-python-libpython_dep.patch
         boost-1.60.0-mingw-context.patch
         boost-1.69-old-style-names-layout.patch
+        boost-1.70.0-fix-python-install.patch
         using-mingw-w64-python.patch
         msys2-mingw-folders-bootstrap.patch)
-sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406'
+sha256sums=('430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778'
             'c5eae6354693c6b4e6364d4cf6f06c6c3de4c28486bf812cbd291f4410126cf8'
             '8d048e8ecee8b7feaa8651d6bc65d63838df240626619a4fb8738512043c3eb1'
             '4551ba9edf64c8ccdab4f4890c20e2e8cf6d4ffa1169d251df11e30d25b886b8'
             'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628'
-            'bb83d991f900a1cfd6a5aa874cbc33f76f3d6ce6388fd996886fdabe79b1f74c'
+            'b4ed25c499649c06614740d6652e2e1ae70d1d08e2dd1e32a02bd0309125ffd2'
             'd4be505bf6cd08b9da232d0311bfda2820dd75cf8911ed07b72eddc418c73614'
             '9d159f713fecbcb2b8faf2534da4cbb223bde6c3e393218aca2c0b3dfc3374c1'
             'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
             '01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c'
             '9ac0fc0306114d709958ae6e17fdd38616fa7c352d10346f099b51ef49d0ec4e'
             'c2508e60bed41471b396875e0289b4b1d4e021f3d01f4294615c72fcd8567439'
+            '21d039cf867a41253f752c5f04f0cdb2ec86f17ad88459918b326fa48e9c1e05'
             '0dd6346d369850aad13bf8d9bc2f0abc16d4b0586e34d61fab11f65d3d7fa9d4'
             '81f74c2eafbe004bcbb863cc3cd74571adcffed1169dde86645db4441be236e1')
 
@@ -99,6 +101,10 @@ prepare() {
 
   msg2 "msys2-mingw-folders-bootstrap.patch"
   patch -p1 -i ${srcdir}/msys2-mingw-folders-bootstrap.patch
+
+  # Fix installation of both Python versions
+  msg2 "boost-1.70.0-fix-python-install.patch"
+  patch -p1 -i ${srcdir}/boost-1.70.0-fix-python-install.patch
 }
 
 build() {
@@ -211,4 +217,8 @@ package() {
 
   mkdir -p ${pkgdir}${MINGW_PREFIX}/bin
   mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin
+
+  # install b2 and bjam
+  install -Dm755 b2.exe "${pkgdir}${MINGW_PREFIX}"/bin/b2.exe
+  cp -rf "${pkgdir}${MINGW_PREFIX}"/bin/b2.exe "${pkgdir}${MINGW_PREFIX}"/bin/bjam.exe
 }
diff --git a/mingw-w64-boost/boost-1.57.0-build-optflags.patch b/mingw-w64-boost/boost-1.57.0-build-optflags.patch
@@ -19,7 +19,7 @@ diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
  }
 
  actions compile.c.preprocess bind PCH_FILE
-@@ -755,17 +755,17 @@ generators.override gcc.compile.c++.pch
+@@ -702,17 +702,17 @@
  ###
 
  # Declare flags and action for compilation.
@@ -39,10 +39,10 @@ diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
 
 -toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
 -toolset.flags gcc.compile OPTIONS <warnings>on  : -Wall ;
--toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
+-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall ;
 +toolset.flags gcc.compile OPTIONS <warnings>off :  ;
 +toolset.flags gcc.compile OPTIONS <warnings>on  :  ;
 +toolset.flags gcc.compile OPTIONS <warnings>all :  ;
+ toolset.flags gcc.compile OPTIONS <warnings>extra : -Wall -Wextra ;
+ toolset.flags gcc.compile OPTIONS <warnings>pedantic : -Wall -Wextra -pedantic ;
  toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
-
- toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
diff --git a/mingw-w64-boost/boost-1.70.0-fix-python-install.patch b/mingw-w64-boost/boost-1.70.0-fix-python-install.patch
@@ -0,0 +1,22 @@
+--- boost_1_70_0.orig/tools/build/src/build/virtual-target.jam	2019-04-12 16:15:08.325230800 -0400
++++ boost_1_70_0/tools/build/src/build/virtual-target.jam	2019-04-12 16:53:35.810087000 -0400
+@@ -1137,19 +1137,6 @@
+             properties-added = [ set.difference $(p2) : $(p1) ] ;
+             properties-added ?= "none" ;
+         }
+-        import errors : user-error : errors.user-error ;
+-        errors.user-error "Name clash for '$(actual-name)'"
+-            : ""
+-            : "Tried to build the target twice, with property sets having "
+-            : "these incompatible properties:"
+-            : ""
+-            : "    - " $(properties-removed)
+-            : "    - " $(properties-added)
+-            : ""
+-            : "Please make sure to have consistent requirements for these "
+-            : "properties everywhere in your project, especially for install"
+-            : "targets."
+-            ;
+     }
+     else
+     {