diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-28 21:55:57 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-07 22:26:38 +0000 |
| commit | 4e5d7c86a8a5e752df451d988861a86236e8c8ff (patch) | |
| tree | 062e509c13bef69db1b65a474da21f6d7d7cd73d /meta/recipes-support/apr | |
| parent | d6327189d2e86f0647a2cf11bc3dc3effa51a55d (diff) | |
| download | openembedded-core-4e5d7c86a8a5e752df451d988861a86236e8c8ff.tar.gz | |
apr: Fix to work with autoconf 2.70
Fix an issue with autoconf 2.70 where duplicate macro includes
caused configure failures.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Diffstat (limited to 'meta/recipes-support/apr')
| -rw-r--r-- | meta/recipes-support/apr/apr/autoconf270.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-support/apr/apr_1.7.0.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/autoconf270.patch b/meta/recipes-support/apr/apr/autoconf270.patch new file mode 100644 index 0000000000..9f7b5c624c --- /dev/null +++ b/meta/recipes-support/apr/apr/autoconf270.patch @@ -0,0 +1,22 @@ +With autoconf 2.70 confdefs.h is already included. Including it twice generates +compiler warnings and since this macros is to error on warnings, it breaks. + +Fix by not including the file. + +Upstream-Status: Pending +RP - 2021/1/28 + +Index: apr-1.7.0/build/apr_common.m4 +=================================================================== +--- apr-1.7.0.orig/build/apr_common.m4 ++++ apr-1.7.0/build/apr_common.m4 +@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + fi + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( +- [#include "confdefs.h" +- ] ++ [] + [[$1]] + [int main(int argc, const char *const *argv) {] + [[$2]] diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index c9b9bf0f50..f879e2864a 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -23,6 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ + file://autoconf270.patch \ " SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" |