[arch-commits] Commit in mongodb/trunk (PKGBUILD boost160.patch)

[Evangelos Foutras]

    Date: Tuesday, December 22, 2015 @ 10:47:29
  Author: foutrelis
Revision: 154155

Fix build with boost 1.60.0

Added:
  mongodb/trunk/boost160.patch
Modified:
  mongodb/trunk/PKGBUILD

----------------+
 PKGBUILD       |    6 +++++-
 boost160.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 09:33:50 UTC (rev 154154)
+++ PKGBUILD	2015-12-22 09:47:29 UTC (rev 154155)
@@ -21,8 +21,10 @@
 backup=('etc/mongodb.conf')
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
+        'boost160.patch'
         'mongodb.conf' 'mongodb.service')
 sha512sums=('4b321b582f5ec2613b869b003a02494c8a9e3b772b1f13898417b1e831c204468309a0e1785acd3b85c8a663cae91e55e44f53f8b74bd3a516b1e1471f606882'
+            '385c82875174caae433a3b381eb10f98a6fed0c8943788ddefff1de80a898e480bdbbf094a7783285cf2ae11ce3fc6878e57d58183d05be2f0837b206aaa4da6'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9')
 
@@ -49,11 +51,12 @@
 
 prepare() {
   cd mongodb-src-r${pkgver}
-  export SCONSFLAGS="$MAKEFLAGS"
+  patch -Np1 -i ../boost160.patch
 }
 
 build() {
   cd mongodb-src-r${pkgver}
+  export SCONSFLAGS="$MAKEFLAGS"
 
   scons core tools "${_scons_args[@]}"
 }
@@ -60,6 +63,7 @@
 
 check() {
   cd mongodb-src-r${pkgver}
+  export SCONSFLAGS="$MAKEFLAGS"
 
   # Setting LANG to workaround the following test error:
   # std::exception: locale::facet::_S_create_c_locale name not valid

Added: boost160.patch
===================================================================
--- boost160.patch	                        (rev 0)
+++ boost160.patch	2015-12-22 09:47:29 UTC (rev 154155)
@@ -0,0 +1,11 @@
+diff -uprb mongodb-src-r3.2.0.orig/SConstruct mongodb-src-r3.2.0/SConstruct
+--- mongodb-src-r3.2.0.orig/SConstruct	2015-12-02 21:01:34.000000000 +0200
++++ mongodb-src-r3.2.0/SConstruct	2015-12-22 11:18:23.613216445 +0200
+@@ -2245,6 +2245,7 @@ def doConfigure(myenv):
+             # permit more than four parameters.
+             "BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD",
+             "BOOST_SYSTEM_NO_DEPRECATED",
++            "BOOST_OPTIONAL_USE_SINGLETON_DEFINITION_OF_NONE",
+         ]
+     )
+