From 06f0c435630c31ce1ffab1f75ffac52986be4923 Mon Sep 17 00:00:00 2001 From: Marc Vertes Date: Sun, 16 Apr 2017 18:58:26 +0200 Subject: testing/mongodb: upgrade to version 3.4.3 --- testing/mongodb/20-fix-libc-version.patch | 41 ------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 testing/mongodb/20-fix-libc-version.patch (limited to 'testing/mongodb/20-fix-libc-version.patch') diff --git a/testing/mongodb/20-fix-libc-version.patch b/testing/mongodb/20-fix-libc-version.patch deleted file mode 100644 index 1f7b517c94..0000000000 --- a/testing/mongodb/20-fix-libc-version.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/mongo/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp -index d1ed23a..0c1011e 100644 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -335,6 +335,7 @@ public: - paths.push_back("/etc/debian_release"); - paths.push_back("/etc/slackware-version"); - paths.push_back("/etc/centos-release"); -+ paths.push_back("/etc/alpine-release"); - paths.push_back("/etc/os-release"); - - for (i = paths.begin(); i != paths.end(); ++i) { -@@ -421,10 +422,10 @@ double ProcessInfo::getSystemMemoryPressurePercentage() { - - void ProcessInfo::getExtraInfo(BSONObjBuilder& info) { - // [dm] i don't think mallinfo works. (64 bit.) ?? -- struct mallinfo malloc_info = -- mallinfo(); // structure has same name as function that returns it. (see malloc.h) -- info.append("heap_usage_bytes", -- malloc_info.uordblks /*main arena*/ + malloc_info.hblkhd /*mmap blocks*/); -+ //struct mallinfo malloc_info = -+ // mallinfo(); // structure has same name as function that returns it. (see malloc.h) -+ // TODO: Fix for TC_malloc instance().getStats() -+ info.append("heap_usage_bytes", 0); - // docs claim hblkhd is included in uordblks but it isn't - - LinuxProc p(_pid); ---- ./src/mongo/util/processinfo_linux.cpp.orig -+++ ./src/mongo/util/processinfo_linux.cpp -@@ -37,8 +37,10 @@ - #include - #ifdef __UCLIBC__ - #include --#else -+#elif defined(__GLIBC__) - #include -+#else -+#define gnu_get_libc_version(x) "unknown" - #endif - - #include "processinfo.h" -- cgit v1.2.3