mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-09 04:11:16 +00:00
jsonrpc: Backport and create patches to build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+26
@@ -0,0 +1,26 @@
|
|||||||
|
From f5416f1c2b2989f94163a2ae4b91c9b9fa13c620 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Fri, 31 Mar 2017 13:32:31 -0700
|
||||||
|
Subject: [PATCH 1/2] memset() and family needs to include string.h
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp
|
||||||
|
index 9fca57b..e63c49e 100644
|
||||||
|
--- a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp
|
||||||
|
+++ b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp
|
||||||
|
@@ -16,7 +16,7 @@
|
||||||
|
#include <cstdio>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
-#include <string>
|
||||||
|
+#include <cstring>
|
||||||
|
|
||||||
|
using namespace jsonrpc;
|
||||||
|
using namespace std;
|
||||||
|
--
|
||||||
|
2.12.1
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
From 79050ef9607f242e0d509969b19e9390220c3411 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yongwei Wu <wuyongwei@gmail.com>
|
||||||
|
Date: Sat, 31 Dec 2016 11:57:11 +0800
|
||||||
|
Subject: [PATCH 2/2] Fix build problem on Mac.
|
||||||
|
|
||||||
|
__suseconds_t is not defined on Mac/BSD; use the POSIX-conformant
|
||||||
|
suseconds_t.
|
||||||
|
---
|
||||||
|
src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp
|
||||||
|
index 8e019ca..68107f2 100644
|
||||||
|
--- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp
|
||||||
|
+++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp
|
||||||
|
@@ -122,7 +122,7 @@ int FileDescriptorServer::WaitForRead() {
|
||||||
|
FD_ZERO(&except_fds);
|
||||||
|
FD_SET(inputfd, &read_fds);
|
||||||
|
timeout.tv_sec = 0;
|
||||||
|
- timeout.tv_usec = (__suseconds_t) (READ_TIMEOUT * 1000000);
|
||||||
|
+ timeout.tv_usec = (suseconds_t) (READ_TIMEOUT * 1000000);
|
||||||
|
// Wait for something to read
|
||||||
|
return select(inputfd + 1, &read_fds, &write_fds, &except_fds, &timeout);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.12.1
|
||||||
|
|
||||||
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \
|
|||||||
file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \
|
file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \
|
||||||
file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \
|
file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \
|
||||||
file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \
|
file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \
|
||||||
"
|
file://0001-memset-and-family-needs-to-include-string.h.patch \
|
||||||
|
file://0002-Fix-build-problem-on-Mac.patch \
|
||||||
|
"
|
||||||
SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e"
|
SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e"
|
||||||
|
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
|
|||||||
Reference in New Issue
Block a user