mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
xmlrpc-c: Update to 1.51.03
Fix build with clang while here Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-52
@@ -1,52 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
+27
@@ -0,0 +1,27 @@
|
|||||||
|
From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Tue, 29 Jan 2019 13:31:39 -0800
|
||||||
|
Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
|
||||||
|
|
||||||
|
/mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
|
||||||
|
&, sockaddr *, unsigned int>'
|
||||||
|
rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
|
||||||
|
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
|
||||||
|
1 file changed, 28 insertions(+), 28 deletions(-)
|
||||||
|
|
||||||
|
--- a/test/cpp/server_abyss.cpp
|
||||||
|
+++ b/test/cpp/server_abyss.cpp
|
||||||
|
@@ -85,7 +85,7 @@ public:
|
||||||
|
sockAddr.sin_port = htons(portNumber);
|
||||||
|
sockAddr.sin_addr.s_addr = 0;
|
||||||
|
|
||||||
|
- rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
|
||||||
|
+ rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
|
||||||
|
|
||||||
|
if (rc != 0) {
|
||||||
|
closesock(this->fd);
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
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 perl"
|
|
||||||
|
|
||||||
inherit cmake
|
|
||||||
|
|
||||||
EXTRA_OECMAKE = "-D_lib:STRING=${baselib}"
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
|
||||||
|
|
||||||
TARGET_CFLAGS += "-Wno-narrowing"
|
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
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/mirror/xmlrpc-c.git \
|
||||||
|
file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
|
||||||
|
file://0002-fix-formatting-issues.patch \
|
||||||
|
"
|
||||||
|
#Release 1.51.03
|
||||||
|
SRCREV = "343a3b98e54999d67edb644bcd395aa9784fb16e"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git/stable"
|
||||||
|
|
||||||
|
DEPENDS = "libxml2"
|
||||||
|
RDEPENDS_${PN} = "perl"
|
||||||
|
|
||||||
|
inherit autotools-brokensep pkgconfig
|
||||||
|
|
||||||
|
TARGET_CFLAGS += "-Wno-narrowing"
|
||||||
|
|
||||||
|
EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
|
||||||
|
LD_FOR_BUILD='${BUILD_LD}' \
|
||||||
|
CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
|
||||||
|
LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \
|
||||||
|
"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "curl cplusplus"
|
||||||
|
|
||||||
|
PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl,"
|
||||||
|
PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,,"
|
||||||
|
PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl"
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
|
||||||
|
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
|
||||||
|
autoconf
|
||||||
|
oe_runconf
|
||||||
|
# license is incompatible with lib/util/getoptx.*
|
||||||
|
rm -fv ${S}/tools/turbocharger/mod_gzip.c
|
||||||
|
}
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
|
CLEANBROKEN = "1"
|
||||||
Reference in New Issue
Block a user