diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-31 19:15:25 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-05 19:28:30 +0200 |
commit | 01feee2cd909d7388fa395269fad1b6bc7ccf2f1 (patch) | |
tree | 3fe7e0171d77b200b990a6de4dc65b49a92a8067 /meta-oe/recipes-devtools/jsonrpc | |
parent | 38f0f1310b3bae6edaf4d6185b49163c63eaa96d (diff) | |
download | meta-openembedded-01feee2cd909d7388fa395269fad1b6bc7ccf2f1.tar.gz |
jsonrpc: Backport and create patches to build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/jsonrpc')
3 files changed, 56 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch new file mode 100644 index 000000000..21ef98bf5 --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From f5416f1c2b2989f94163a2ae4b91c9b9fa13c620 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 31 Mar 2017 13:32:31 -0700 | ||
4 | Subject: [PATCH 1/2] memset() and family needs to include string.h | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | ||
12 | index 9fca57b..e63c49e 100644 | ||
13 | --- a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | ||
14 | +++ b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | ||
15 | @@ -16,7 +16,7 @@ | ||
16 | #include <cstdio> | ||
17 | #include <fcntl.h> | ||
18 | #include <unistd.h> | ||
19 | -#include <string> | ||
20 | +#include <cstring> | ||
21 | |||
22 | using namespace jsonrpc; | ||
23 | using namespace std; | ||
24 | -- | ||
25 | 2.12.1 | ||
26 | |||
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch new file mode 100644 index 000000000..aece45b02 --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 79050ef9607f242e0d509969b19e9390220c3411 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yongwei Wu <wuyongwei@gmail.com> | ||
3 | Date: Sat, 31 Dec 2016 11:57:11 +0800 | ||
4 | Subject: [PATCH 2/2] Fix build problem on Mac. | ||
5 | |||
6 | __suseconds_t is not defined on Mac/BSD; use the POSIX-conformant | ||
7 | suseconds_t. | ||
8 | --- | ||
9 | src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | ||
13 | index 8e019ca..68107f2 100644 | ||
14 | --- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | ||
15 | +++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | ||
16 | @@ -122,7 +122,7 @@ int FileDescriptorServer::WaitForRead() { | ||
17 | FD_ZERO(&except_fds); | ||
18 | FD_SET(inputfd, &read_fds); | ||
19 | timeout.tv_sec = 0; | ||
20 | - timeout.tv_usec = (__suseconds_t) (READ_TIMEOUT * 1000000); | ||
21 | + timeout.tv_usec = (suseconds_t) (READ_TIMEOUT * 1000000); | ||
22 | // Wait for something to read | ||
23 | return select(inputfd + 1, &read_fds, &write_fds, &except_fds, &timeout); | ||
24 | } | ||
25 | -- | ||
26 | 2.12.1 | ||
27 | |||
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb index 3a43f90ff..eb1ff65b6 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb | |||
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ | |||
13 | file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \ | 13 | file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \ |
14 | file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \ | 14 | file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \ |
15 | file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \ | 15 | file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \ |
16 | " | 16 | file://0001-memset-and-family-needs-to-include-string.h.patch \ |
17 | file://0002-Fix-build-problem-on-Mac.patch \ | ||
18 | " | ||
17 | SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e" | 19 | SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e" |
18 | 20 | ||
19 | SECTION = "libs" | 21 | SECTION = "libs" |