mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-16 15:25:53 +01:00
xmlrpc-c: 1.60.03 -> 1.64.0
Refresh local patches: - 0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch - 0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
1329e39d47
commit
c6cbcb0344
|
|
@ -1,6 +1,6 @@
|
||||||
From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
|
From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Tue, 29 Jan 2019 13:31:39 -0800
|
Date: Mon, 10 Mar 2025 20:25:02 -0700
|
||||||
Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
|
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
|
/mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
|
||||||
|
|
@ -10,10 +10,15 @@ Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
|
||||||
|
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
---
|
|
||||||
test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
|
|
||||||
1 file changed, 28 insertions(+), 28 deletions(-)
|
|
||||||
|
|
||||||
|
Rebase to 1.64.0
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
test/cpp/server_abyss.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
|
||||||
|
index c1b44995..14faf5a5 100644
|
||||||
--- a/test/cpp/server_abyss.cpp
|
--- a/test/cpp/server_abyss.cpp
|
||||||
+++ b/test/cpp/server_abyss.cpp
|
+++ b/test/cpp/server_abyss.cpp
|
||||||
@@ -85,7 +85,7 @@ public:
|
@@ -85,7 +85,7 @@ public:
|
||||||
|
|
@ -25,3 +30,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
if (rc != 0) {
|
if (rc != 0) {
|
||||||
closesock(this->fd);
|
closesock(this->fd);
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
From c9bd05e8f0ad805b81625cfa717d06071cfd9b48 Mon Sep 17 00:00:00 2001
|
From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Wed, 16 Oct 2024 22:52:38 -0700
|
Date: Mon, 10 Mar 2025 20:26:29 -0700
|
||||||
Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make calls running in parallel
|
Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make
|
||||||
|
calls running in parallel
|
||||||
|
|
||||||
With high parallel execution, it results in race condition where
|
With high parallel execution, it results in race condition where
|
||||||
its trying to create symlink while the original symlink while rm is
|
its trying to create symlink while the original symlink while rm is
|
||||||
|
|
@ -29,50 +30,14 @@ but I don't see any changes which should cause this in the git since
|
||||||
1.59.01, but the gentoo bug report is against 1.54.06 already.
|
1.59.01, but the gentoo bug report is against 1.54.06 already.
|
||||||
|
|
||||||
martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil++/Makefile after-clean-j1.log
|
martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil++/Makefile after-clean-j1.log
|
||||||
make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
|
make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
|
||||||
all
|
all
|
||||||
--
|
--
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
|
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
|
||||||
libxmlrpc_util++.so
|
libxmlrpc_util++.so
|
||||||
|
|
||||||
martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil/Makefile after-clean-j1.log
|
|
||||||
make -C libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
all
|
|
||||||
--
|
--
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/Makefile \
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
|
||||||
--
|
|
||||||
make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
|
|
||||||
libxmlrpc_util.so
|
libxmlrpc_util.so
|
||||||
|
|
||||||
Similar error reported here [1]
|
Similar error reported here [1]
|
||||||
|
|
@ -82,12 +47,15 @@ Similar error reported here [1]
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Rebase to 1.64.0
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
---
|
---
|
||||||
unix-common.mk | 6 ++----
|
unix-common.mk | 6 ++----
|
||||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/unix-common.mk b/unix-common.mk
|
diff --git a/unix-common.mk b/unix-common.mk
|
||||||
index 6954faf5..983c48cd 100644
|
index 6954faf5..e15a4f5c 100644
|
||||||
--- a/unix-common.mk
|
--- a/unix-common.mk
|
||||||
+++ b/unix-common.mk
|
+++ b/unix-common.mk
|
||||||
@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
|
@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
|
||||||
|
|
@ -107,3 +75,6 @@ index 6954faf5..983c48cd 100644
|
||||||
|
|
||||||
.PHONY: $(SHLIB_INSTALL_TARGETS)
|
.PHONY: $(SHLIB_INSTALL_TARGETS)
|
||||||
.PHONY: install-shared-libraries
|
.PHONY: install-shared-libraries
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
|
||||||
file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
|
file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
|
||||||
file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
|
file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
|
||||||
"
|
"
|
||||||
# one more commit after Release 1.60.03 in the Stable series
|
# one more commit after Release 1.64.0 in the Stable series
|
||||||
SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
|
SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
|
||||||
|
|
||||||
S = "${WORKDIR}/git/stable"
|
S = "${WORKDIR}/git/stable"
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user