mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-18 08:15:56 +01:00
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>
This commit is contained in:
parent
e989546d7d
commit
b3cb662fe3
18
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
Normal file
18
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
Normal file
|
|
@ -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.
|
||||||
|
|
@ -6,6 +6,7 @@ LICENSE = "BSD-3-Clause & MIT"
|
||||||
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
|
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
|
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-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 \
|
||||||
"
|
"
|
||||||
|
|
@ -18,6 +19,7 @@ inherit autotools-brokensep binconfig pkgconfig
|
||||||
|
|
||||||
TARGET_CFLAGS += "-Wno-narrowing"
|
TARGET_CFLAGS += "-Wno-narrowing"
|
||||||
|
|
||||||
|
# These are needed for the integrated expat
|
||||||
EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
|
EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
|
||||||
LD_FOR_BUILD='${BUILD_LD}' \
|
LD_FOR_BUILD='${BUILD_LD}' \
|
||||||
CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
|
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[cplusplus] = "--enable-cplusplus,--disable-cplusplus"
|
||||||
PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl"
|
PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl"
|
||||||
|
|
||||||
do_configure() {
|
do_configure:prepend() {
|
||||||
gnu-configize --verbose --force ${S}
|
|
||||||
autoconf
|
|
||||||
oe_runconf
|
|
||||||
# license is incompatible with lib/util/getoptx.*
|
# license is incompatible with lib/util/getoptx.*
|
||||||
rm -fv ${S}/tools/turbocharger/mod_gzip.c
|
rm -fv ${S}/tools/turbocharger/mod_gzip.c
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user