From c6cbcb0344b744c3106ee33d2962dc5d8566bcd8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 11 Mar 2025 15:35:53 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- ...rver_abyss-Fix-build-with-clang-libc.patch | 18 ++++-- ...nsuring-Sequential-Execution-of-rm-a.patch | 59 +++++-------------- ...xmlrpc-c_1.60.03.bb => xmlrpc-c_1.64.0.bb} | 4 +- 3 files changed, 30 insertions(+), 51 deletions(-) rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.60.03.bb => xmlrpc-c_1.64.0.bb} (93%) 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 @@ -From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001 +From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001 From: Khem Raj -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++ /mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind ---- - test/cpp/server_abyss.cpp | 56 +++++++++++++++++++-------------------- - 1 file changed, 28 insertions(+), 28 deletions(-) +Rebase to 1.64.0 +Signed-off-by: Hongxu Jia +--- + 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 +++ b/test/cpp/server_abyss.cpp @@ -85,7 +85,7 @@ public: @@ -25,3 +30,6 @@ Signed-off-by: Khem Raj if (rc != 0) { closesock(this->fd); +-- +2.25.1 + 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 @@ -From c9bd05e8f0ad805b81625cfa717d06071cfd9b48 Mon Sep 17 00:00:00 2001 +From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Wed, 16 Oct 2024 22:52:38 -0700 -Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make calls running in parallel +Date: Mon, 10 Mar 2025 20:26:29 -0700 +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 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. 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 libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/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 -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 \ - 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 \ +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 Similar error reported here [1] @@ -82,12 +47,15 @@ Similar error reported here [1] Upstream-Status: Pending Signed-off-by: Martin Jansa Signed-off-by: Khem Raj + +Rebase to 1.64.0 +Signed-off-by: Hongxu Jia --- unix-common.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/unix-common.mk b/unix-common.mk -index 6954faf5..983c48cd 100644 +index 6954faf5..e15a4f5c 100644 --- a/unix-common.mk +++ b/unix-common.mk @@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^ @@ -107,3 +75,6 @@ index 6954faf5..983c48cd 100644 .PHONY: $(SHLIB_INSTALL_TARGETS) .PHONY: install-shared-libraries +-- +2.25.1 + 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 similarity index 93% rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb rename to 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 \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.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 -SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e" +# one more commit after Release 1.64.0 in the Stable series +SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601" S = "${WORKDIR}/git/stable"