From 4898ba5642848533e99f43523a73df9ff4252795 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 19 Jul 2023 14:19:00 +0200 Subject: [PATCH] - updated to 1.7.4 --- apr-autoconf.patch | 64 ---------------------------------------------- apr-libtool.patch | 17 ------------ apr.spec | 11 +++----- 3 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 apr-autoconf.patch delete mode 100644 apr-libtool.patch diff --git a/apr-autoconf.patch b/apr-autoconf.patch deleted file mode 100644 index 488c3c5..0000000 --- a/apr-autoconf.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5593f23e8e062da108ed585535e7281b87346ee1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 25 Nov 2020 09:36:25 +0000 -Subject: [PATCH] build/apr_common.m4: avoid explicit inclusion of - '"confdefs.h"' - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -``` -$ autoreconf && ./configure -... -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -``` -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | -``` - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - -Bug: https://bugs.gentoo.org/738156 -Bug: https://bugs.gentoo.org/750353 -Signed-off-by: Sergei Trofimovich ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index f4e2dfd0a7..6f5782e674 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -504,13 +504,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - 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-libtool.patch b/apr-libtool.patch deleted file mode 100644 index 6618972..0000000 --- a/apr-libtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -must give hint to libtool which tag to use, in case we use ccache and then -libtool is unable to autodetect from $CC - ---- apr-1.5.0/configure.in.orig 2013-11-22 17:29:57.303051538 +0100 -+++ apr-1.5.0/configure.in 2013-11-22 17:31:11.273048433 +0100 -@@ -280,9 +280,9 @@ - [ use_libtool=$withval ], [ use_libtool="yes" ] ) - - if test "x$use_libtool" = "xyes"; then -- lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' -+ lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@' - LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" -- link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@" -+ link="\$(LIBTOOL) \$(LTFLAGS) --mode=link --tag=CC \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@" - so_ext='lo' - lib_target='-rpath $(libdir) $(OBJECTS)' - export_lib_target='-rpath \$(libdir) \$(OBJECTS)' diff --git a/apr.spec b/apr.spec index 9dc83d3..5870301 100644 --- a/apr.spec +++ b/apr.spec @@ -5,18 +5,16 @@ Summary: Apache Portable Runtime Summary(pl.UTF-8): Apache Portable Runtime - przenośna biblioteka uruchomieniowa Name: apr -Version: 1.7.0 -Release: 3 +Version: 1.7.4 +Release: 1 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -# Source0-md5: 7a14a83d664e87599ea25ff4432e48a7 +# Source0-md5: f8a62f3984898ba0ea8b6f26b851cb99 Patch0: %{name}-link.patch -Patch1: %{name}-libtool.patch # disable some things that require recent kernel Patch2: %{name}-disable-features.patch -Patch3: %{name}-autoconf.patch URL: http://apr.apache.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -26,6 +24,7 @@ BuildRequires: libuuid-devel BuildRequires: python3 BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 2.007 BuildRequires: sed >= 4.0 BuildRequires: uname(release) >= 2.6 Requires: uname(release) >= 2.6.28 @@ -90,9 +89,7 @@ Statyczna biblioteka apr. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 -%patch3 -p1 cat >> config.layout <<'EOF' -- 2.37.3