mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
databases/mongodb34{,-rocks}: unbreak with boost 1.66
PR: 224090 224091 Approved by: maintainer timeout (1 month)
This commit is contained in:
parent
0c387f0d99
commit
679c7cc1a6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=460156
4 changed files with 28 additions and 2 deletions
|
@ -20,7 +20,6 @@ LICENSE= AGPLv3 APACHE20
|
|||
LICENSE_COMB= multi
|
||||
|
||||
BROKEN= fails to link
|
||||
BROKEN= fails to build with boost 1.66, see bug 224091
|
||||
|
||||
ONLY_FOR_ARCHS= amd64
|
||||
ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)"
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
Drop unnecessary use of boost::make_optional
|
||||
https://jira.mongodb.org/browse/SERVER-32516
|
||||
|
||||
--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC
|
||||
+++ src/mongo/db/repl/oplog_fetcher.cpp
|
||||
@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
|
||||
if (!metadataResult.isOK()) {
|
||||
return metadataResult.getStatus();
|
||||
}
|
||||
- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
|
||||
+ oqMetadata = metadataResult.getValue();
|
||||
}
|
||||
return oqMetadata;
|
||||
}
|
|
@ -18,7 +18,6 @@ COMMENT= Distributed document-oriented "NoSQL" database
|
|||
LICENSE= AGPLv3 APACHE20
|
||||
LICENSE_COMB= multi
|
||||
|
||||
BROKEN= fails to build with boost 1.66, see bug 224090
|
||||
ONLY_FOR_ARCHS= amd64
|
||||
ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)"
|
||||
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
Drop unnecessary use of boost::make_optional
|
||||
https://jira.mongodb.org/browse/SERVER-32516
|
||||
|
||||
--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC
|
||||
+++ src/mongo/db/repl/oplog_fetcher.cpp
|
||||
@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
|
||||
if (!metadataResult.isOK()) {
|
||||
return metadataResult.getStatus();
|
||||
}
|
||||
- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
|
||||
+ oqMetadata = metadataResult.getValue();
|
||||
}
|
||||
return oqMetadata;
|
||||
}
|
Loading…
Add table
Reference in a new issue