Restore configure script port to C99

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
Florian Weimer 2022-12-22 09:07:49 +01:00
parent 090145addf
commit fc6f7e4b7e
2 changed files with 24 additions and 1 deletions

View File

@ -0,0 +1,18 @@
Add a missing implied int in the Berkeley DB configure probe. This
avoids build failures with future Fedora toolchain defaults.
Submitted upstream: <https://bz.apache.org/bugzilla/show_bug.cgi?id=66396>
diff --git a/build/dbm.m4 b/build/dbm.m4
index 57bd131fc3b74099..ffdbdbc0f43e04da 100644
--- a/build/dbm.m4
+++ b/build/dbm.m4
@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB],
#include <stdlib.h>
#include <stdio.h>
#include <$apu_try_berkeley_db_header>
-main ()
+int main ()
{
int major, minor, patch;

View File

@ -25,13 +25,14 @@
Summary: Apache Portable Runtime Utility library Summary: Apache Portable Runtime Utility library
Name: apr-util Name: apr-util
Version: 1.6.3 Version: 1.6.3
Release: 4%{?dist} Release: 5%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: https://apr.apache.org/ URL: https://apr.apache.org/
Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Patch1: apr-util-1.2.7-pkgconf.patch Patch1: apr-util-1.2.7-pkgconf.patch
Patch2: apr-util-1.4.1-private.patch Patch2: apr-util-1.4.1-private.patch
Patch3: apr-util-1.6.3-allow-ipv6.patch Patch3: apr-util-1.6.3-allow-ipv6.patch
Patch4: apr-util-configure-c99.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: autoconf, apr-devel >= 1.3.0
BuildRequires: %{dbdep}, expat-devel, libuuid-devel BuildRequires: %{dbdep}, expat-devel, libuuid-devel
@ -135,6 +136,7 @@ This package provides the NSS crypto support for the apr-util.
%patch1 -p1 -b .pkgconf %patch1 -p1 -b .pkgconf
%patch2 -p1 -b .private %patch2 -p1 -b .private
%patch3 -p1 -b .r1907541 %patch3 -p1 -b .r1907541
%patch4 -p1
: Configured for LDAP library: %{ldaplib} : Configured for LDAP library: %{ldaplib}
@ -232,6 +234,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%changelog %changelog
* Wed Aug 30 2023 Florian Weimer <fweimer@redhat.com> - 1.6.3-5
- Restore configure script port to C99
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-4 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild