diff options
Diffstat (limited to 'community/mongodb/fix-processinfo_linux.patch')
| -rw-r--r-- | community/mongodb/fix-processinfo_linux.patch | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/community/mongodb/fix-processinfo_linux.patch b/community/mongodb/fix-processinfo_linux.patch index 0c07fa4c81..a5411371a3 100644 --- a/community/mongodb/fix-processinfo_linux.patch +++ b/community/mongodb/fix-processinfo_linux.patch @@ -1,30 +1,32 @@ ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -40,11 +40,11 @@ - #include <sys/mman.h> +--- mongodb-src-r4.0.0/src/mongo/util/processinfo_linux.cpp.orig ++++ mongodb-src-r4.0.0/src/mongo/util/processinfo_linux.cpp +@@ -42,13 +42,7 @@ + #include <sys/time.h> #include <sys/utsname.h> #include <unistd.h> --#ifdef __UCLIBC__ -+//#ifdef __UCLIBC__ +-#ifdef __BIONIC__ +-#include <android/api-level.h> +-#elif __UCLIBC__ #include <features.h> -#else -#include <gnu/libc-version.h> -#endif -+//#else -+//#include <gnu/libc-version.h> -+//#endif #include <boost/filesystem.hpp> #include <boost/none.hpp> -@@ -487,13 +487,9 @@ +@@ -495,17 +489,9 @@ BSONObjBuilder bExtra; bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version")); --#ifdef __UCLIBC__ +-#ifdef __BIONIC__ stringstream ss; -- ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; -+ ss << "musl-1.1.16"; +- ss << "bionic (android api " << __ANDROID_API__ << ")"; ++ ss << "musl-1.1.19"; bExtra.append("libcVersion", ss.str()); +-#elif __UCLIBC__ +- stringstream ss; +- ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; +- bExtra.append("libcVersion", ss.str()); -#else - bExtra.append("libcVersion", gnu_get_libc_version()); -#endif |