6 files changed, 167 insertions, 46 deletions

diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
new file mode 100644
index 0000000000..813efbc62a
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
@@ -0,0 +1,50 @@
+From a811ea6af5296b89ee7c2a358dd4ffd2584429f4 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 2 Apr 2025 11:00:27 +0900
+Subject: [PATCH] fix bool reserved word error in gcc 15
+
+* Fix build error with gcc-15.0.1
+  http://errors.yoctoproject.org/Errors/Details/850147/
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+    srcdir/lib/util/include/bool.h:15:3: warning: useless type name in empty declaration
+    In file included from sleep.c:2:
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+
+  gcc-15 switched to -std=c23 by default.
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+
+Upstream-Status: Submitted [https://sourceforge.net/p/xmlrpc-c/discussion/131628/thread/70e626d73a]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ stable/lib/util/include/bool.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/stable/lib/util/include/bool.h b/stable/lib/util/include/bool.h
+index 312477c4..a5e81eb6 100644
+--- a/stable/lib/util/include/bool.h
++++ b/stable/lib/util/include/bool.h
+@@ -9,10 +9,12 @@
+ /* At least the GNU compiler defines __bool_true_false_are_defined */
+ #ifndef __bool_true_false_are_defined
+ #define __bool_true_false_are_defined
++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
+ typedef enum {
+     false = 0,
+     true = 1
+ } bool;
+ #endif
+ #endif
++#endif
+ 
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 <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++
 
 /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
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
+ 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 <raj.khem@gmail.com>
          
          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
new file mode 100644
index 0000000000..15e088965f
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
@@ -0,0 +1,80 @@
+From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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
+not done deleting the existing file yet.
+
+The issue is that submake for libxmlrpc_util.so is called 12 times
+which can run in parallel and then some of them will try to create
+target link at the same time (after both already finished rm call).
+
+Use -f which should be supported even by relatively old ln and
+should avoid the need for rm (and hopefully will avoid this race)
+
+For libutil++ it calls "all" and "libxmlrpc_util++.so" only once,
+but for libutil it calls "all" and then 12 times libxmlrpc_util.so
+(after-clean-j1.log is the make output with -n and -j1 instead of
+-j70), still trying to figure out why, my autofoo is rusty :).
+
+Ideally we should prevent calling it 12 times, but until we figure
+out why we can at least avoid the random build failures.
+
+Another interesting fact is that I haven't seen this issue until
+the upgrade to 1.60.03 from 1.59.01 from:
+https://lists.openembedded.org/g/openembedded-devel/message/112706
+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/lib/libutil++/Makefile \
+    all
+--
+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/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]
+
+[1] https://bugs.gentoo.org/932835
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@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 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/unix-common.mk b/unix-common.mk
+index 6954faf5..e15a4f5c 100644
+--- a/unix-common.mk
++++ b/unix-common.mk
+@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%:%.$(MAJ)
+-       rm -f $@
+-       $(LN_S) $< $@
++       $(LN_S) -f $< $@
+ 
+ SONAME_TARGETS = $(SHLIB_LE_TARGETS:%=%.$(MAJ))
+ 
+ $(SONAME_TARGETS):%:%.$(MIN)
+-       rm -f $@
+-       $(LN_S) $< $@
++       $(LN_S) -f $< $@
+ 
+ .PHONY: $(SHLIB_INSTALL_TARGETS)
+ .PHONY: install-shared-libraries
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
deleted file mode 100644
index 9d92e4712b..0000000000
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sun, 23 Jul 2017 22:20:29 -0400
-Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal
-and no format arguments [-Werror=format-security]
-|             xmlrpc_faultf(envP, error);
-|             ^~~~~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- src/xmlrpc_server_abyss.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
-index 2388652..3843f10 100644
---- a/src/xmlrpc_server_abyss.c
-+++ b/src/xmlrpc_server_abyss.c
-@@ -768,7 +768,7 @@ createServer(xmlrpc_env *                      const envP,
-         ServerInit2(abyssServerP, &error);
- 
-         if (error) {
--            xmlrpc_faultf(envP, error);
-+            xmlrpc_faultf(envP, "%s", error);
-             xmlrpc_strfree(error);
-         }
-     }
--- 
-2.8.1
-
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
new file mode 100644
index 0000000000..f309cd4890
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
@@ -0,0 +1,18 @@
+This doesn't use automake so don't turn it on, as autoreconf will refuse to work.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git i/stable/configure.in w/stable/configure.in
+index 4a9ade8c..baba1edc 100644
+--- i/configure.in
++++ w/configure.in
+@@ -8,7 +8,7 @@ dnl =======================================================================
+ 
+ dnl "x.xx" is supposed to be a version number, but is meaningless here.
+ dnl The real version number is in Makefile.version.
+-AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
++dnl AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
+ 
+ dnl Define @build@, @build_cpu@, @build_vendor@, @build_os,
+ dnl @host, @host_cpu@, @host_vender, and @host_os@ substitutions.
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
index 5d5152b834..3b923fb99e 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -6,18 +6,20 @@ LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
 
 SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
+           file://no-automake.patch \
            file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
-           file://0002-fix-formatting-issues.patch \
+           file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
+           file://0001-fix-bool-reserved-word-error-in-gcc-15.patch;striplevel=2 \
            "
-#Release 1.59.01
-SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278"
+SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
 
-S = "${WORKDIR}/git/stable"
+S = "${UNPACKDIR}/${BP}/advanced"
 
 inherit autotools-brokensep binconfig pkgconfig
 
 TARGET_CFLAGS += "-Wno-narrowing"
 
+# These are needed for the integrated expat
 EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
                  LD_FOR_BUILD='${BUILD_LD}' \
                  CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
@@ -32,10 +34,7 @@ PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-ab
 PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus"
 PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl"
 
-do_configure() {
-        gnu-configize --verbose --force ${S}
-        autoconf
-        oe_runconf
+do_configure:prepend() {
         # license is incompatible with lib/util/getoptx.*
         rm -fv ${S}/tools/turbocharger/mod_gzip.c
 }