xmlrpc-c: use autoreconf

Add a patch to not use AM_INIT_AUTOMAKE as automake isn't actually used,
and just let autotools.bbclass run autoreconf.

Signed-off-by: Ross Burton <ross.burton@arm.com>

2 files changed, 21 insertions, 4 deletions

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.60.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
index f5ee920cad..0e0385ab29 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
@@ -6,6 +6,7 @@ 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://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
            "
@@ -18,6 +19,7 @@ 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
 }