diff options
Diffstat (limited to 'testing/mongodb/20-fix-libc-version.patch')
| -rw-r--r-- | testing/mongodb/20-fix-libc-version.patch | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/testing/mongodb/20-fix-libc-version.patch b/testing/mongodb/20-fix-libc-version.patch index 3b213cc3d5..1f7b517c94 100644 --- a/testing/mongodb/20-fix-libc-version.patch +++ b/testing/mongodb/20-fix-libc-version.patch @@ -1,7 +1,7 @@ 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_linux2.cpp -+++ b/src/mongo/util/processinfo_linux2.cpp +--- 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"); @@ -25,20 +25,17 @@ index d1ed23a..0c1011e 100644 // docs claim hblkhd is included in uordblks but it isn't LinuxProc p(_pid); -diff --git a/src/mongo/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp -index 0c1011e..755a2cc 100644 ---- a/src/mongo/util/processinfo_linux2.cpp -+++ b/src/mongo/util/processinfo_linux2.cpp -@@ -34,7 +34,11 @@ - #include <stdio.h> - #include <unistd.h> - #include <sys/mman.h> --#include <gnu/libc-version.h> -+#ifdef __GLIBC__ -+# include <gnu/libc-version.h> -+#else -+# define gnu_get_libc_version(x) "unknown" -+#endif +--- ./src/mongo/util/processinfo_linux.cpp.orig ++++ ./src/mongo/util/processinfo_linux.cpp +@@ -37,8 +37,10 @@ #include <sys/utsname.h> + #ifdef __UCLIBC__ + #include <features.h> +-#else ++#elif defined(__GLIBC__) + #include <gnu/libc-version.h> ++#else ++#define gnu_get_libc_version(x) "unknown" + #endif #include "processinfo.h" |