Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=19385fec8640d57c1d0e4d2756cda2c6055b23e7
commit 19385fec8640d57c1d0e4d2756cda2c6055b23e7 Author: DeX77 <[email protected]> Date: Mon Jul 24 19:17:45 2017 +0200 mongodb-3.4.6-1-x86_64 * version bump diff --git a/source/apps-extra/mongodb/FrugalBuild b/source/apps-extra/mongodb/FrugalBuild index cf196ef..76d5726 100644 --- a/source/apps-extra/mongodb/FrugalBuild +++ b/source/apps-extra/mongodb/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: boobaa <[email protected]> pkgname=mongodb -pkgver=3.4.4 -pkgrel=3 +pkgver=3.4.6 +pkgrel=1 pkgdesc="A scalable, high-performance, open source NoSQL database" url="http://www.mongodb.org"; up2date="lynx -dump $url/downloads | grep src- -m1 | sed 's/.*-src-r\(.*\)\.tar.*/\1/'" @@ -11,8 +11,12 @@ groups=('apps-extra') archs=('x86_64') depends=('libstdc++>=6.2.1-8' 'openssl>=1.0.2-12' 'pcre' 'zlib' 'yaml-cpp' 'snappy>=1.1.6' 'libboost>=1.61.0-3' 'libpcap') makedepends+=('scons' 'boost>=1.61.0-3') -source=(http://downloads.mongodb.org/src/mongodb-src-r$pkgver.tar.gz) -sha1sums=('6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955') +source=(http://downloads.mongodb.org/src/mongodb-src-r$pkgver.tar.gz \ + fix-boost-version-check.patch \ + using-std-string.patch ) +sha1sums=('5ea6b2323ec1ef0ce057548ad37859b379140b5e' \ + 'eac8a738b8eb284203d6ad63937aaeff138e961f' \ + '7e2dc2af8bc8b0c694c346904c6b53ff5b0df419') options+=('static') ## TODO: - some default conf ? @@ -24,7 +28,8 @@ build() ### F*** this scons Fcd $pkgname-src-r$pkgver Fpatchall - sed -i -e 's|ASSERT_PARSES(double, "0xabcab.defdefP-10", 0xabcab.defdefP-10);||' src/mongo/base/parse_number_test.cpp || Fdie + Fsed '-std=c++11' '-std=gnu++11' SConstruct + export SCONSFLAGS="$MAKEFLAGS" OPT="--disable-warnings-as-errors \ --ssl --use-system-zlib \ diff --git a/source/apps-extra/mongodb/fix-boost-version-check.patch b/source/apps-extra/mongodb/fix-boost-version-check.patch new file mode 100644 index 0000000..5f66f3c --- /dev/null +++ b/source/apps-extra/mongodb/fix-boost-version-check.patch @@ -0,0 +1,58 @@ +diff --git a/SConstruct b/SConstruct +index 5365fcb..13149ab 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -2603,26 +2603,6 @@ def doConfigure(myenv): + if conf.CheckCXX11Align(): + conf.env.SetConfigHeaderDefine('MONGO_CONFIG_HAVE_STD_ALIGN') + +- myenv = conf.Finish() +- +- def CheckBoostMinVersion(context): +- compile_test_body = textwrap.dedent(""" +- #include <boost/version.hpp> +- +- #if BOOST_VERSION < 104900 +- #error +- #endif +- """) +- +- context.Message("Checking if system boost version is 1.49 or newer...") +- result = context.TryCompile(compile_test_body, ".cpp") +- context.Result(result) +- return result +- +- conf = Configure(myenv, custom_tests = { +- 'CheckBoostMinVersion': CheckBoostMinVersion, +- }) +- + # pthread_setname_np was added in GLIBC 2.12, and Solaris 11.3 + if posix_system: + myenv = conf.Finish() +@@ -2650,6 +2630,26 @@ def doConfigure(myenv): + if conf.CheckPThreadSetNameNP(): + conf.env.SetConfigHeaderDefine("MONGO_CONFIG_HAVE_PTHREAD_SETNAME_NP") + ++ myenv = conf.Finish() ++ ++ def CheckBoostMinVersion(context): ++ compile_test_body = textwrap.dedent(""" ++ #include <boost/version.hpp> ++ ++ #if BOOST_VERSION < 104900 ++ #error ++ #endif ++ """) ++ ++ context.Message("Checking if system boost version is 1.49 or newer...") ++ result = context.TryCompile(compile_test_body, ".cpp") ++ context.Result(result) ++ return result ++ ++ conf = Configure(myenv, custom_tests = { ++ 'CheckBoostMinVersion': CheckBoostMinVersion, ++ }) ++ + libdeps.setup_conftests(conf) + + def addOpenSslLibraryToDistArchive(file_name): diff --git a/source/apps-extra/mongodb/using-std-string.patch b/source/apps-extra/mongodb/using-std-string.patch new file mode 100644 index 0000000..4abcb32 --- /dev/null +++ b/source/apps-extra/mongodb/using-std-string.patch @@ -0,0 +1,70 @@ +diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp +index b202e05..0255613 100644 +--- a/src/mongo/db/dbwebserver.cpp ++++ b/src/mongo/db/dbwebserver.cpp +@@ -67,6 +67,7 @@ namespace mongo { + using std::map; + using std::stringstream; + using std::vector; ++using std::string; + + using namespace html; + +diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp +index d562bff..b96a36d 100644 +--- a/src/mongo/db/matcher/expression_leaf.cpp ++++ b/src/mongo/db/matcher/expression_leaf.cpp +@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con + } + + void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const { +- string opString = ""; ++ std::string opString = ""; + switch (matchType()) { + case LT: + opString = "$lt"; +@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const + } + + void BitTestMatchExpression::serialize(BSONObjBuilder* out) const { +- string opString = ""; ++ std::string opString = ""; + + switch (matchType()) { + case BITS_ALL_SET: +diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp +index 05faad1..7fbc062 100644 +--- a/src/mongo/db/repl/master_slave.cpp ++++ b/src/mongo/db/repl/master_slave.cpp +@@ -81,6 +81,7 @@ using std::set; + using std::stringstream; + using std::unique_ptr; + using std::vector; ++using std::string; + + namespace mongo { + namespace repl { +diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp +index 040002f..cb0f6f4 100644 +--- a/src/mongo/shell/bench.cpp ++++ b/src/mongo/shell/bench.cpp +@@ -78,6 +78,7 @@ namespace mongo { + using std::unique_ptr; + using std::cout; + using std::map; ++using std::string; + + const std::map<OpType, std::string> opTypeName{{OpType::NONE, "none"}, + {OpType::NOP, "nop"}, +diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp +index 5f4165d..7a7d071 100644 +--- a/src/mongo/util/net/miniwebserver.cpp ++++ b/src/mongo/util/net/miniwebserver.cpp +@@ -47,6 +47,7 @@ namespace mongo { + using std::shared_ptr; + using std::stringstream; + using std::vector; ++using std::string; + + MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) + : Listener(name, ip, port, ctx, false, false) {} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
