diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-09-23 12:47:22 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-23 18:35:16 -0700 |
commit | bf0c72662f3dd150e9d77fd177487ef839d59f70 (patch) | |
tree | df3c1695bb634d2d4e6c214f780b5f13b1bc85bc /meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch | |
parent | b315c1a024d8b1d1444934de738bb7a239eae9aa (diff) | |
download | meta-openembedded-contrib-bf0c72662f3dd150e9d77fd177487ef839d59f70.tar.gz |
mongodb: Fix build on musl/aarch64
one impl of strerror_r is glibc specific, therefore check for __GLIBC__
also before using it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch deleted file mode 100644 index c6035894ed..0000000000 --- a/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: git/src/mongo/util/errno_util.cpp -=================================================================== ---- git.orig/src/mongo/util/errno_util.cpp -+++ git/src/mongo/util/errno_util.cpp -@@ -49,6 +49,16 @@ const char kUnknownMsg[] = "Unknown erro - const int kBuflen = 256; // strerror strings in non-English locales can be large. - } // namespace - -+inline char const * strerror_r_helper( char const * r, char const * ) -+{ -+ return r; -+} -+ -+inline char const * strerror_r_helper( int r, char const * buffer ) -+{ -+ return r == 0? buffer: "Unknown error"; -+} -+ - std::string errnoWithDescription(int errNumber) { - #if defined(_WIN32) - if (errNumber == -1) -@@ -63,7 +73,7 @@ std::string errnoWithDescription(int err - - #if defined(__GNUC__) && defined(_GNU_SOURCE) && \ - (!defined(__ANDROID_API__) || !(__ANDROID_API__ <= 22)) && !defined(EMSCRIPTEN) -- msg = strerror_r(errNumber, buf, kBuflen); -+ msg = strerror_r_helper(strerror_r(errNumber, buf, kBuflen)); - #elif defined(_WIN32) - - LPWSTR errorText = nullptr; |