summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-29 14:51:47 -0800
committerKhem Raj <raj.khem@gmail.com>2019-01-30 13:34:49 -0800
commit920265d47a9d75a8f4054ec2291c7a1c6dc904e8 (patch)
tree03e8f9d766d84093d0b7987226e65a4a87512dbb
parent6fd901de5a59c660a7e9e6d9abec000c7b849b3c (diff)
downloadmeta-openembedded-920265d47a9d75a8f4054ec2291c7a1c6dc904e8.tar.gz
xmlrpc-c: Update to 1.51.03
Fix build with clang while here Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch52
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch27
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb24
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb49
4 files changed, 76 insertions, 76 deletions
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch
deleted file mode 100644
index 234d696f1..000000000
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 950b27f8320b841490cafcb3e6e3b818c7174c0d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 20 Jul 2017 22:32:50 -0400
4Subject: [PATCH] fix compile failure against musl C library
5
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 test/cpp/server_abyss.cpp | 2 +-
11 tools/xmlrpc_pstream/xmlrpc_pstream.cpp | 10 +++++++---
12 2 files changed, 8 insertions(+), 4 deletions(-)
13
14diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
15index 2458a8f..82f91da 100644
16--- a/test/cpp/server_abyss.cpp
17+++ b/test/cpp/server_abyss.cpp
18@@ -18,7 +18,7 @@
19 #ifdef WIN32
20 #include <winsock2.h>
21 #else
22- #include <sys/unistd.h>
23+ #include <unistd.h>
24 #include <sys/socket.h>
25 #include <arpa/inet.h>
26 #include <netinet/in.h>
27diff --git a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
28index d39e105..1fd8900 100644
29--- a/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
30+++ b/tools/xmlrpc_pstream/xmlrpc_pstream.cpp
31@@ -15,11 +15,15 @@
32 #include "xmlrpc-c/girerr.hpp"
33 using girerr::throwf;
34
35-#include <features.h> // for __BEGIN_DECLS
36+#ifdef __cplusplus
37+extern "C" {
38+#endif
39
40-__BEGIN_DECLS
41 #include "dumpvalue.h" /* An internal Xmlrpc-c header file ! */
42-__END_DECLS
43+
44+#ifdef __cplusplus
45+}
46+#endif
47
48
49 #include <xmlrpc-c/base.hpp>
50--
512.8.1
52
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
new file mode 100644
index 000000000..be83b0166
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
@@ -0,0 +1,27 @@
1From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Jan 2019 13:31:39 -0800
4Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
5
6/mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
7&, sockaddr *, unsigned int>'
8 rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
9 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
15 1 file changed, 28 insertions(+), 28 deletions(-)
16
17--- a/test/cpp/server_abyss.cpp
18+++ b/test/cpp/server_abyss.cpp
19@@ -85,7 +85,7 @@ public:
20 sockAddr.sin_port = htons(portNumber);
21 sockAddr.sin_addr.s_addr = 0;
22
23- rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
24+ rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
25
26 if (rc != 0) {
27 closesock(this->fd);
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
deleted file mode 100644
index efa58f198..000000000
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \
2write an XML-RPC server or client in C or C++."
3
4HOMEPAGE = "http://xmlrpc-c.sourceforge.net/"
5LICENSE = "BSD & MIT"
6LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
7
8SRC_URI = "git://github.com/ensc/xmlrpc-c.git;branch=master \
9 file://0001-fix-compile-failure-against-musl-C-library.patch \
10 file://0002-fix-formatting-issues.patch \
11"
12SRCREV = "81443a9dc234cc275449dbc17867ad77ae189124"
13S = "${WORKDIR}/git"
14
15DEPENDS = "curl libxml2"
16RDEPENDS_${PN} = "curl perl"
17
18inherit cmake
19
20EXTRA_OECMAKE = "-D_lib:STRING=${baselib}"
21
22BBCLASSEXTEND = "native"
23
24TARGET_CFLAGS += "-Wno-narrowing"
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb
new file mode 100644
index 000000000..02ea8cc5f
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb
@@ -0,0 +1,49 @@
1DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \
2write an XML-RPC server or client in C or C++."
3
4HOMEPAGE = "http://xmlrpc-c.sourceforge.net/"
5LICENSE = "BSD & MIT"
6LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
7
8SRC_URI = "git://github.com/mirror/xmlrpc-c.git \
9 file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
10 file://0002-fix-formatting-issues.patch \
11 "
12#Release 1.51.03
13SRCREV = "343a3b98e54999d67edb644bcd395aa9784fb16e"
14
15S = "${WORKDIR}/git/stable"
16
17DEPENDS = "libxml2"
18RDEPENDS_${PN} = "perl"
19
20inherit autotools-brokensep pkgconfig
21
22TARGET_CFLAGS += "-Wno-narrowing"
23
24EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
25 LD_FOR_BUILD='${BUILD_LD}' \
26 CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
27 LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \
28 "
29
30EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client"
31
32PACKAGECONFIG ??= "curl cplusplus"
33
34PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl,"
35PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,,"
36PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl"
37
38do_configure() {
39 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
40 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
41 autoconf
42 oe_runconf
43 # license is incompatible with lib/util/getoptx.*
44 rm -fv ${S}/tools/turbocharger/mod_gzip.c
45}
46
47BBCLASSEXTEND = "native"
48
49CLEANBROKEN = "1"