summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch16
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch59
-rw-r--r--meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb (renamed from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb)4
3 files changed, 29 insertions, 50 deletions
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
index be83b0166c..531f0d45fb 100644
--- 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
@@ -1,6 +1,6 @@
1From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001 1From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Jan 2019 13:31:39 -0800 3Date: Mon, 10 Mar 2025 20:25:02 -0700
4Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++ 4Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
5 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 6/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++
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14Rebase to 1.64.0
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13--- 16---
14 test/cpp/server_abyss.cpp | 56 +++++++++++++++++++-------------------- 17 test/cpp/server_abyss.cpp | 2 +-
15 1 file changed, 28 insertions(+), 28 deletions(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
16 19
20diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
21index c1b44995..14faf5a5 100644
17--- a/test/cpp/server_abyss.cpp 22--- a/test/cpp/server_abyss.cpp
18+++ b/test/cpp/server_abyss.cpp 23+++ b/test/cpp/server_abyss.cpp
19@@ -85,7 +85,7 @@ public: 24@@ -85,7 +85,7 @@ public:
@@ -25,3 +30,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 30
26 if (rc != 0) { 31 if (rc != 0) {
27 closesock(this->fd); 32 closesock(this->fd);
33--
342.25.1
35
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
index 152667661e..15e088965f 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
@@ -1,7 +1,8 @@
1From c9bd05e8f0ad805b81625cfa717d06071cfd9b48 Mon Sep 17 00:00:00 2001 1From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Oct 2024 22:52:38 -0700 3Date: Mon, 10 Mar 2025 20:26:29 -0700
4Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make calls running in parallel 4Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make
5 calls running in parallel
5 6
6With high parallel execution, it results in race condition where 7With high parallel execution, it results in race condition where
7its trying to create symlink while the original symlink while rm is 8its 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
291.59.01, but the gentoo bug report is against 1.54.06 already. 301.59.01, but the gentoo bug report is against 1.54.06 already.
30 31
31martin@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 32martin@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
32make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \ 33make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
33 all 34 all
34-- 35--
35make -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 \ 36make -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 \
36 libxmlrpc_util++.so 37 libxmlrpc_util++.so
37 38
38martin@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
39make -C libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
40 all
41-- 39--
42make -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 \ 40make -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 \
43 libxmlrpc_util.so
44--
45make -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 \
46 libxmlrpc_util.so
47--
48make -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 \
49 libxmlrpc_util.so
50--
51make -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 \
52 libxmlrpc_util.so
53--
54make -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 \
55 libxmlrpc_util.so
56--
57make -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 \
58 libxmlrpc_util.so
59--
60make -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 \
61 libxmlrpc_util.so
62--
63make -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 \
64 libxmlrpc_util.so
65--
66make -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 \
67 libxmlrpc_util.so
68--
69make -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 \
70 libxmlrpc_util.so
71--
72make -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 \
73 libxmlrpc_util.so
74--
75make -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 \
76 libxmlrpc_util.so 41 libxmlrpc_util.so
77 42
78Similar error reported here [1] 43Similar error reported here [1]
@@ -82,12 +47,15 @@ Similar error reported here [1]
82Upstream-Status: Pending 47Upstream-Status: Pending
83Signed-off-by: Martin Jansa <martin.jansa@gmail.com> 48Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
84Signed-off-by: Khem Raj <raj.khem@gmail.com> 49Signed-off-by: Khem Raj <raj.khem@gmail.com>
50
51Rebase to 1.64.0
52Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
85--- 53---
86 unix-common.mk | 6 ++---- 54 unix-common.mk | 6 ++----
87 1 file changed, 2 insertions(+), 4 deletions(-) 55 1 file changed, 2 insertions(+), 4 deletions(-)
88 56
89diff --git a/unix-common.mk b/unix-common.mk 57diff --git a/unix-common.mk b/unix-common.mk
90index 6954faf5..983c48cd 100644 58index 6954faf5..e15a4f5c 100644
91--- a/unix-common.mk 59--- a/unix-common.mk
92+++ b/unix-common.mk 60+++ b/unix-common.mk
93@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ 61@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
@@ -107,3 +75,6 @@ index 6954faf5..983c48cd 100644
107 75
108 .PHONY: $(SHLIB_INSTALL_TARGETS) 76 .PHONY: $(SHLIB_INSTALL_TARGETS)
109 .PHONY: install-shared-libraries 77 .PHONY: install-shared-libraries
78--
792.25.1
80
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
index 0e0385ab29..62ba0f53e6 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -10,8 +10,8 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
10 file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ 10 file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
11 file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \ 11 file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
12 " 12 "
13# one more commit after Release 1.60.03 in the Stable series 13# one more commit after Release 1.64.0 in the Stable series
14SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e" 14SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
15 15
16S = "${WORKDIR}/git/stable" 16S = "${WORKDIR}/git/stable"
17 17
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-10 16:14:25 +0000