From 2fe1b297615b6ce526870fbf1902c3d0541c26c1 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 29 Aug 2016 13:13:15 +0100 Subject: asio: fix musl compilation (strerror_r) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry picked upstream commit Signed-off-by: André Draszik Signed-off-by: Martin Jansa --- ...ly-handle-glibc-variant-of-strerror_r-wit.patch | 46 ++++++++++++++++++++++ meta-oe/recipes-support/asio/asio_1.10.6.bb | 2 + 2 files changed, 48 insertions(+) create mode 100644 meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch diff --git a/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch new file mode 100644 index 000000000..4244b97a8 --- /dev/null +++ b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch @@ -0,0 +1,46 @@ +From 45c855400842fd40f200ae9b7abf9debf4ab5436 Mon Sep 17 00:00:00 2001 +From: Christopher Kohlhoff +Date: Sun, 28 Aug 2016 09:21:53 +1000 +Subject: [PATCH] Automatically handle glibc variant of strerror_r without + #ifdefs. + +--- +Upstream-Status: Backport https://github.com/chriskohlhoff/asio/commit/443bc17d13eb5e37de780ea6e23157493cf7b3b9 + include/asio/impl/error_code.ipp | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/include/asio/impl/error_code.ipp b/include/asio/impl/error_code.ipp +index ccb70dd..a117658 100644 +--- a/include/asio/impl/error_code.ipp ++++ b/include/asio/impl/error_code.ipp +@@ -97,20 +97,18 @@ public: + #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__) + using namespace std; + return strerror(value); +-#elif defined(__MACH__) && defined(__APPLE__) \ +- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ +- || defined(_AIX) || defined(__hpux) || defined(__osf__) \ +- || defined(__ANDROID__) +- char buf[256] = ""; +- using namespace std; +- strerror_r(value, buf, sizeof(buf)); +- return buf; + #else + char buf[256] = ""; +- return strerror_r(value, buf, sizeof(buf)); ++ using namespace std; ++ return strerror_result(strerror_r(value, buf, sizeof(buf)), buf); + #endif + #endif // defined(ASIO_WINDOWS) + } ++ ++private: ++ // Helper function to adapt the result from glibc's variant of strerror_r. ++ static const char* strerror_result(int, const char* s) { return s; } ++ static const char* strerror_result(const char* s, const char*) { return s; } + }; + + } // namespace detail +-- +2.9.3 + diff --git a/meta-oe/recipes-support/asio/asio_1.10.6.bb b/meta-oe/recipes-support/asio/asio_1.10.6.bb index db4ae80a2..d6f4dddc0 100644 --- a/meta-oe/recipes-support/asio/asio_1.10.6.bb +++ b/meta-oe/recipes-support/asio/asio_1.10.6.bb @@ -4,3 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04" SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2" SRC_URI[sha256sum] = "e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e" + +SRC_URI += "file://0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch" -- cgit v1.2.3-54-g00ecf