summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorApollon Oikonomopoulos <apoikos@debian.org>2016-12-14 23:07:28 +0200
committerApollon Oikonomopoulos <apoikos@debian.org>2016-12-14 23:20:12 +0200
commit4b6ed8d5464a55c3e47c27ec2149555eb2e3f0cf (patch)
tree717431f8bb430c1204992ae92cc3c8c5aca7ad22
parent9480055b5ff812037e728b8a843247a3a7d8fb83 (diff)
Fix build with boost 1.62; patch by NetBSD
-rw-r--r--debian/patches/fix-boost-1.62-build.patch17
-rw-r--r--debian/patches/series1
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/fix-boost-1.62-build.patch b/debian/patches/fix-boost-1.62-build.patch
new file mode 100644
index 00000000000..3123c81a622
--- /dev/null
+++ b/debian/patches/fix-boost-1.62-build.patch
@@ -0,0 +1,17 @@
+Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/mongodb/patches/patch-src_mongo_db_fts_unicode_string.cpp?rev=1.1&content-type=text/x-cvsweb-markup
+Description: Fix FTBFS with boost 1.62
+Last-Update: 2016-12-14
+Forwarded: no
+Index: mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
+===================================================================
+--- mongodb-3.2.11.orig/src/mongo/db/fts/unicode/string.cpp
++++ mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
+@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
+
+ // Case sensitive and diacritic sensitive.
+ return boost::algorithm::boyer_moore_search(
+- haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
++ haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
+ }
+
+ } // namespace unicode
diff --git a/debian/patches/series b/debian/patches/series
index 9e9475f5be0..83b3ee68f5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
hardened-build.patch
fix-gcc-6-ftbfs.patch
fix-boost-1.60-build.patch
+fix-boost-1.62-build.patch