asio: fix musl compilation (strerror_r)
PATCH 1/1 asio: fix musl compilation (strerror_r)
Cherry picked github pull request #95
https://github.com/chriskohlhoff/asio/pull/95
https://github.com/chriskohlhoff/asio/pull/95.patch
Signed-off-by André Draszik <[email protected]>
--- meta-oe/recipes-support/asio/asio/95.patch | 43 +++++++++++++++++++++++++++++ meta-oe/recipes-support/asio/asio_1.10.6.bb | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-support/asio/asio/95.patch
meta-oe/recipes-support/asio/asio/95.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 52d862c4e8af60a31f0067e1070b8625e805cdc3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <[email protected]> +Date: Thu, 21 Jan 2016 23:37:32 +0100 +Subject: [PATCH] Fix use of strerror_r() + +Don't try keep track of all platforms which follows posix standard. +Instead, make the platform which don't follow standard to an exception +and fall back to standard implementation for everything else. + +This fixes building with musl libc. + +Fixes #94 +--- +Upstream-Status: Backport https://github.com/chriskohlhoff/asio/pull/95 + asio/include/asio/impl/error_code.ipp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/asio/include/asio/impl/error_code.ipp b/asio/include/asio/impl/error_code.ipp +index b996773..3a1cff1 100644 +--- a/asio/include/asio/impl/error_code.ipp ++++ b/asio/include/asio/impl/error_code.ipp +@@ -98,17 +98,14 @@ 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__) ++#elif defined(__GLIBC__) && defined(_GNU_SOURCE) ++ char buf[256] = ""; ++ return strerror_r(value, buf, sizeof(buf)); ++#else + 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)); + #endif + #endif // defined(ASIO_WINDOWS_DESKTOP) || defined(__CYGWIN__) + }
meta-oe/recipes-support/asio/asio_1.10.6.bb +2 -0
@@ -4,3 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04" SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2" SRC_URI[sha256sum] = "e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e" + +SRC_URI += "file://95.patch;pnum=2"
Signature · 1 line
2.9.3
Quoted 4 lines · André Draszik
Cherry picked github pull request #95
https://github.com/chriskohlhoff/asio/pull/95
https://github.com/chriskohlhoff/asio/pull/95.patch
this is fine
Quoted 67 lines
Signed-off-by André Draszik <[email protected]>--- meta-oe/recipes-support/asio/asio/95.patch | 43 +++++++++++++++++++++++++++++ meta-oe/recipes-support/asio/asio_1.10.6.bb | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 meta-oe/recipes-support/asio/asio/95.patchmeta-oe/recipes-support/asio/asio/95.patch new file +43
-0@@ -0,0 +1,43 @@ +From 52d862c4e8af60a31f0067e1070b8625e805cdc3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <[email protected]> +Date: Thu, 21 Jan 2016 23:37:32 +0100 +Subject: [PATCH] Fix use of strerror_r() + +Don't try keep track of all platforms which follows posix standard. +Instead, make the platform which don't follow standard to an exception +and fall back to standard implementation for everything else. + +This fixes building with musl libc. + +Fixes #94 +--- +Upstream-Status: Backport https://github.com/chriskohlhoff/asio/pull/95 + asio/include/asio/impl/error_code.ipp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/asio/include/asio/impl/error_code.ipp b/asio/include/asio/impl/error_code.ipp +index b996773..3a1cff1 100644 +--- a/asio/include/asio/impl/error_code.ipp ++++ b/asio/include/asio/impl/error_code.ipp +@@ -98,17 +98,14 @@ 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__) ++#elif defined(__GLIBC__) && defined(_GNU_SOURCE) ++ char buf[256] = ""; ++ return strerror_r(value, buf, sizeof(buf)); ++#else + 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)); + #endif + #endif // defined(ASIO_WINDOWS_DESKTOP) || defined(__CYGWIN__) + }meta-oe/recipes-support/asio/asio_1.10.6.bb +2
-0@@ -4,3 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04" SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2" SRC_URI[sha256sum] = "e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e" + +SRC_URI += "file://95.patch;pnum=2"
PATCH v2 1/1 asio: fix musl compilation (strerror_r)
In reply to André DraszikCherry picked upstream commit
Signed-off-by André Draszik <[email protected]>
--- ...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
meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 45c855400842fd40f200ae9b7abf9debf4ab5436 Mon Sep 17 00:00:00 2001 +From: Christopher Kohlhoff <[email protected]> +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 +
meta-oe/recipes-support/asio/asio_1.10.6.bb +2 -0
@@ -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"
Signature · 1 line
2.9.3