diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-28 21:55:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-14 14:59:10 +0000 |
commit | c86b92df02e97a6bc4c478bd82738f7fdc40363d (patch) | |
tree | e61b6e4ab5f0a8abab653e71a2a060aed2ab929c | |
parent | 76b5620df706dc4ebf2ba2a654057e3e9f452652 (diff) | |
download | poky-c86b92df02e97a6bc4c478bd82738f7fdc40363d.tar.gz |
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: 41121149212b3684991a62261c17a45afd50bb83)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@arm.com>
(cherry picked from commit 4e5d7c86a8a5e752df451d988861a86236e8c8ff)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@ | |||
1 | With autoconf 2.70 confdefs.h is already included. Including it twice generates | ||
2 | compiler warnings and since this macros is to error on warnings, it breaks. | ||
3 | |||
4 | Fix by not including the file. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | RP - 2021/1/28 | ||
8 | |||
9 | Index: apr-1.7.0/build/apr_common.m4 | ||
10 | =================================================================== | ||
11 | --- apr-1.7.0.orig/build/apr_common.m4 | ||
12 | +++ apr-1.7.0/build/apr_common.m4 | ||
13 | @@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], | ||
14 | fi | ||
15 | AC_COMPILE_IFELSE( | ||
16 | [AC_LANG_SOURCE( | ||
17 | - [#include "confdefs.h" | ||
18 | - ] | ||
19 | + [] | ||
20 | [[$1]] | ||
21 | [int main(int argc, const char *const *argv) {] | ||
22 | [[$2]] | ||
diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index 92cc61a864..b70edfaf42 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 \ | |||
23 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ | 23 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ |
24 | file://libtoolize_check.patch \ | 24 | file://libtoolize_check.patch \ |
25 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 25 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
26 | file://autoconf270.patch \ | ||
26 | file://CVE-2021-35940.patch \ | 27 | file://CVE-2021-35940.patch \ |
27 | " | 28 | " |
28 | 29 | ||