Attachment 189885 Details for Bug 224821 – 3.6.2 with Boost 1.66 build fix

[patch] 3.6.2 with Boost 1.66 build fix

mongodb362.diff (text/plain), 4.03 KB, created by dev on 2018-01-18 13:11:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dev

Created: 2018-01-18 13:11:36 UTC

Size: 4.03 KB

patch

obsolete

>Index: databases/mongodb36/Makefile
>===================================================================
>--- databases/mongodb36/Makefile	(revision 457789)
>+++ databases/mongodb36/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	mongodb
> DISTVERSIONPREFIX=	r
>-DISTVERSION=	3.6.0
>+DISTVERSION=	3.6.2
> CATEGORIES=	databases net
> MASTER_SITES=	https://fastdl.mongodb.org/src/ \
> 		http://fastdl.mongodb.org/src/ \
>@@ -24,8 +24,8 @@
> 		${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
> LIB_DEPENDS=	libpcre.so:devel/pcre \
>-		libsnappy.so:archivers/snappy \
>-		libboost_system.so:devel/boost-libs
>+		libboost_system.so:devel/boost-libs \
>+		libsnappy.so:archivers/snappy
> 
> CONFLICTS_BUILD=	mongo-cxx-driver
> CONFLICTS_INSTALL=	mongodb[32-4]*
>@@ -34,7 +34,7 @@
> USE_RC_SUBR=	mongod
> 
> SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
>-
>+ # Bug 224821: use bundled boost 1.60 to avoid 1.66 build breakage
> MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
> 		--use-system-pcre --use-system-snappy \
> 		--use-system-boost --use-system-zlib \
>Index: databases/mongodb36/distinfo
>===================================================================
>--- databases/mongodb36/distinfo	(revision 457789)
>+++ databases/mongodb36/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513015173
>-SHA256 (mongodb-src-r3.6.0.tar.gz) = 1573e6e172a6a1e559e1156b0f059f3639774a9f3db33790cb826c56e1398efd
>-SIZE (mongodb-src-r3.6.0.tar.gz) = 39994543
>+TIMESTAMP = 1515676780
>+SHA256 (mongodb-src-r3.6.2.tar.gz) = 018788bd31d6953e55cda0ad0771d23e6b78e024a8a6404a80a900c67215b0a7
>+SIZE (mongodb-src-r3.6.2.tar.gz) = 39999539
>Index: databases/mongodb36/files/mongod.in
>===================================================================
>Index: databases/mongodb36/files/patch-SConstruct
>===================================================================
>--- databases/mongodb36/files/patch-SConstruct	(revision 457789)
>+++ databases/mongodb36/files/patch-SConstruct	(working copy)
>@@ -1,4 +1,4 @@
>---- SConstruct.orig	2017-12-01 17:04:06 UTC
>+--- SConstruct.orig	2018-01-04 23:28:55 UTC
> +++ SConstruct
> @@ -922,9 +922,9 @@ if has_option('variables-help'):
>      print(env_vars.GenerateHelpText(env))
>Index: databases/mongodb36/files/patch-rpm_mongod.conf
>===================================================================
>--- databases/mongodb36/files/patch-rpm_mongod.conf	(revision 457789)
>+++ databases/mongodb36/files/patch-rpm_mongod.conf	(working copy)
>@@ -1,4 +1,4 @@
>---- rpm/mongod.conf.orig	2017-12-01 17:04:06 UTC
>+--- rpm/mongod.conf.orig	2018-01-04 23:28:55 UTC
> +++ rpm/mongod.conf
> @@ -7,11 +7,11 @@
>  systemLog:
>Index: databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
>===================================================================
>--- databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	(nonexistent)
>+++ databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2018-01-18 12:18:49 UTC
>++++ src/mongo/db/repl/oplog_fetcher.cpp
>+@@ -245,7 +245,7 @@ StatusWith<boost::optional<rpc::OplogQue
>+         if (!metadataResult.isOK()) {
>+             return metadataResult.getStatus();
>+         }
>+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
>++        oqMetadata = boost::optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
>+     }
>+     return oqMetadata;
>+ }
>
>Property changes on: databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mongodb36/pkg-descr
>===================================================================
>Index: databases/mongodb36/pkg-plist
>===================================================================

Actions: View | Diff

Attachments on bug 224821: 189510 | 189586 | 189617 | 189885 | 189929