1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

apr: Fix to work with autoconf 2.70

Fix an issue with autoconf 2.70 where duplicate macro includes
caused configure failures.

(From OE-Core rev: 4e5d7c86a8a5e752df451d988861a86236e8c8ff)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-01-28 21:55:57 +00:00
parent e1ab06f14b
commit 1729dcf527
2 changed files with 23 additions and 0 deletions
@@ -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]]
+1
View File
@@ -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"