diff --git a/apr-1.7.0-autoconf.patch b/apr-1.7.0-autoconf.patch new file mode 100644 index 0000000..e9e4eac --- /dev/null +++ b/apr-1.7.0-autoconf.patch @@ -0,0 +1,19 @@ +--- a/build/apr_common.m4 2021/03/06 18:45:02 1887278 ++++ b/build/apr_common.m4 2021/03/06 22:20:59 1887279 +@@ -467,13 +467,9 @@ + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE( +- [#include "confdefs.h" +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] ++ [AC_LANG_PROGRAM( ++ [[$1]], + [[$2]] +- [ return 0; }] + )], [CFLAGS=$apr_save_CFLAGS + $3], [CFLAGS=$apr_save_CFLAGS + $4]) + diff --git a/apr.spec b/apr.spec index 3b6eb21..0a7219d 100644 --- a/apr.spec +++ b/apr.spec @@ -6,7 +6,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 1.7.0 -Release: 8%{?dist} +Release: 9%{?dist} # ASL 2.0: everything # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c, @@ -20,6 +20,7 @@ Source1: apr-wrapper.h Patch1: apr-1.2.2-libdir.patch Patch2: apr-1.2.7-pkgconf.patch Patch3: apr-1.7.0-deepbind.patch +Patch4: apr-1.7.0-autoconf.patch BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3 # To enable SCTP support BuildRequires: lksctp-tools-devel @@ -47,6 +48,7 @@ C data structures and routines. %patch1 -p1 -b .libdir %patch2 -p1 -b .pkgconf %patch3 -p1 -b .deepbind +%patch4 -p1 -b .autoconf-2-71 %build # regenerate configure script etc. @@ -125,6 +127,9 @@ popd %{_datadir}/aclocal/*.m4 %changelog +* Mon Apr 12 2021 Lubos Uhliarik - 1.7.0-9 +- Resolves: #1942985 - apr: FTBFS with upcoming autoconf-2.71 + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild