[packages/mongodb] - fix building with boost 1.73 - rel 12

baggins baggins at pld-linux.org
Sun Aug 9 18:23:06 CEST 2020


commit beceadc018565be95ad193d54e757fce885d7d2f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 9 18:22:47 2020 +0200

    - fix building with boost 1.73
    - rel 12

 boost-1.73.patch | 25 +++++++++++++++++++++++++
 mongodb.spec     |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/mongodb.spec b/mongodb.spec
index 03de8ad..8c2374c 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -8,7 +8,7 @@ Summary:	MongoDB client shell and tools
 Summary(pl.UTF-8):	Powłoka kliencka i narzędzia dla bazy danych MongoDB
 Name:		mongodb
 Version:	2.2.4
-Release:	11
+Release:	12
 License:	AGPL v3
 Group:		Applications/Databases
 Source0:	http://downloads.mongodb.org/src/%{name}-src-r%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch5:		gcc4.patch
 Patch6:		no-Werror.patch
 Patch7:		gcc6.patch
 Patch8:		%{name}-pcap.patch
+Patch9:		boost-1.73.patch
 URL:		http://www.mongodb.org/
 BuildRequires:	boost-devel >= 1.50
 BuildRequires:	libpcap-devel
@@ -158,6 +159,7 @@ konfiguracji oraz skrypty init.d.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # Fix permissions
 find -type f -executable | xargs chmod a-x
diff --git a/boost-1.73.patch b/boost-1.73.patch
new file mode 100644
index 0000000..fdec8cd
--- /dev/null
+++ b/boost-1.73.patch
@@ -0,0 +1,25 @@
+--- mongodb-src-r2.2.4/src/mongo/util/goodies.h.orig	2013-04-01 04:41:49.000000000 +0200
++++ mongodb-src-r2.2.4/src/mongo/util/goodies.h	2020-08-09 18:15:59.585368115 +0200
+@@ -18,7 +18,7 @@
+ 
+ #pragma once
+ 
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+ #include <boost/thread/condition_variable.hpp>
+ 
+ #include "mongo/bson/util/misc.h"
+@@ -99,11 +99,11 @@
+             ((x & 0xff000000) >> 24);
+     }
+ 
+-#if defined(BOOST_LITTLE_ENDIAN)
++#if BOOST_ENDIAN_LITTLE_BYTE
+     inline unsigned long fixEndian(unsigned long x) {
+         return x;
+     }
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+     inline unsigned long fixEndian(unsigned long x) {
+         return swapEndian(x);
+     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mongodb.git/commitdiff/beceadc018565be95ad193d54e757fce885d7d2f



More information about the pld-cvs-commit mailing list