mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
xmlrpc-c: add recipe 1.31.0
- Fix compile failure against musl C library - Fixed when compile with "-Wformat -Wformat-security -Werror=format-security" Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
+52
@@ -0,0 +1,52 @@
|
|||||||
|
From 950b27f8320b841490cafcb3e6e3b818c7174c0d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Thu, 20 Jul 2017 22:32:50 -0400
|
||||||
|
Subject: [PATCH] fix compile failure against musl C library
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
test/cpp/server_abyss.cpp | 2 +-
|
||||||
|
tools/xmlrpc_pstream/xmlrpc_pstream.cpp | 10 +++++++---
|
||||||
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
|
||||||
|
index 2458a8f..82f91da 100644
|
||||||
|
--- a/test/cpp/server_abyss.cpp
|
||||||
|
+++ b/test/cpp/server_abyss.cpp
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#else
|
||||||
|
- #include <sys/unistd.h>
|
||||||
|
+ #include <unistd.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
diff --git a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
|
||||||
|
index d39e105..1fd8900 100644
|
||||||
|
--- a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
|
||||||
|
+++ b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
|
||||||
|
@@ -15,11 +15,15 @@
|
||||||
|
#include "xmlrpc-c/girerr.hpp"
|
||||||
|
using girerr::throwf;
|
||||||
|
|
||||||
|
-#include <features.h> // for __BEGIN_DECLS
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+extern "C" {
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-__BEGIN_DECLS
|
||||||
|
#include "dumpvalue.h" /* An internal Xmlrpc-c header file ! */
|
||||||
|
-__END_DECLS
|
||||||
|
+
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
#include <xmlrpc-c/base.hpp>
|
||||||
|
--
|
||||||
|
2.8.1
|
||||||
|
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Sun, 23 Jul 2017 22:20:29 -0400
|
||||||
|
Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues
|
||||||
|
|
||||||
|
Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
|
||||||
|
|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal
|
||||||
|
and no format arguments [-Werror=format-security]
|
||||||
|
| xmlrpc_faultf(envP, error);
|
||||||
|
| ^~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
src/xmlrpc_server_abyss.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
|
||||||
|
index 2388652..3843f10 100644
|
||||||
|
--- a/src/xmlrpc_server_abyss.c
|
||||||
|
+++ b/src/xmlrpc_server_abyss.c
|
||||||
|
@@ -768,7 +768,7 @@ createServer(xmlrpc_env * const envP,
|
||||||
|
ServerInit2(abyssServerP, &error);
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
- xmlrpc_faultf(envP, error);
|
||||||
|
+ xmlrpc_faultf(envP, "%s", error);
|
||||||
|
xmlrpc_strfree(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.8.1
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \
|
||||||
|
write an XML-RPC server or client in C or C++."
|
||||||
|
|
||||||
|
HOMEPAGE = "http://xmlrpc-c.sourceforge.net/"
|
||||||
|
LICENSE = "BSD & MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
|
||||||
|
|
||||||
|
SRC_URI = "git://github.com/ensc/xmlrpc-c.git;branch=master \
|
||||||
|
file://0001-fix-compile-failure-against-musl-C-library.patch \
|
||||||
|
file://0002-fix-formatting-issues.patch \
|
||||||
|
"
|
||||||
|
SRCREV = "81443a9dc234cc275449dbc17867ad77ae189124"
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
DEPENDS = "curl libxml2"
|
||||||
|
RDEPENDS_${PN} = "curl"
|
||||||
|
|
||||||
|
inherit cmake
|
||||||
|
|
||||||
|
EXTRA_OECMAKE = "-D_lib:STRING=${baselib}"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
|
TARGET_CFLAGS += "-Wno-narrowing"
|
||||||
Reference in New Issue
Block a user