package/apr: bump version to 1.7.4
PATCH v2 1/1 package/apr: bump version to 1.7.4
- add 0002-Revert-Fix-crosscompiling-detection-in-apr-1-config.patch (revert of upstram commit [1], additional to keep the follow-up patches to fix apr-util build failure otherwise)
- move 0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch to 0003-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch
- move 0003-Revert-Add-the-ability-to-cross-compile-APR.patch to 0004-Revert-Add-the-ability-to-cross-compile-APR.patch
For details see [2].
[1] https://github.com/apache/apr/commit/130cf8cb3c6fe713095e560ade1df050aa2a6a14
[2] https://downloads.apache.org/apr/CHANGES-APR-1.7
---
Changes v1 -> v2:
- add 0002-Revert-Fix-crosscompiling-detection-in-apr-1-config.patch
- re-add 0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch and 0003-Revert-Add-the-ability-to-cross-compile-APR.patch
- fixes the following apr-util build failure:
Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory
make[2]: *** No rule to make target '.../build/apr-util-1.6.3/build/rules.mk'.
---
...scompiling-detection-in-apr-1-config.patch | 94 +++++++++++++++++++
...1872164.-Fix-the-name-of-libtool-wh.patch} | 0
...dd-the-ability-to-cross-compile-APR.patch} | 0
package/apr/apr.hash | 4 +-
package/apr/apr.mk | 2 +-
5 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 package/apr/0002-Revert-Fix-crosscompiling-detection-in-apr-1-config.patch
rename package/apr/{0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch => 0003-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch} (100%)
rename package/apr/{0003-Revert-Add-the-ability-to-cross-compile-APR.patch => 0004-Revert-Add-the-ability-to-cross-compile-APR.patch} (100%)package/apr/0002-Revert-Fix-crosscompiling-detection-in-apr-1-config.patch new file +94 -0
@@ -0,0 +1,94 @@ +From bcfdaafde561a22874733d22962dad387d9f4e48 Mon Sep 17 00:00:00 2001 +From: Ruediger Pluem <[email protected]> +Date: Fri, 10 Mar 2023 10:54:03 +0000 +Subject: [PATCH] Revert: Fix crosscompiling detection in apr-1-config + +Since r1872148 apr-1-config tries to detect if it runs in a crosscompile +scenario. Fix the detection to correctly distinguish between crosscompiling +and DESTDIR installations for packaging. + +* configure.in: Set APR_CROSS_COMPILING to 'no', 'yes' or 'maybe' based on + possible --host and --build parameters given to configure to determine + if configure was called for a crosscompiling scenario. This was inspired + by how autoconf itself detects crosscompiling scenarios. +* apr-config.in: Use the value from APR_CROSS_COMPILING to determine if + we are in a crosscompiling scenario. Furthermore normalize the pathes + we use for suffix matches by collapsing multiple consecutive '/' to one. + +PR: 66510 + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1908248 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/130cf8cb3c6fe713095e560ade1df050aa2a6a14] +Signed-off-by: Peter Seiderer <[email protected]> +--- + apr-config.in | 29 +++++++---------------------- + configure.in | 12 ------------ + 2 files changed, 7 insertions(+), 34 deletions(-) + +diff --git a/apr-config.in b/apr-config.in +index 626d3b0..bed47ca 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -48,28 +48,13 @@ APR_LIBNAME="@APR_LIBNAME@" + # NOTE: the following line is modified during 'make install': alter with care! + location=@APR_CONFIG_LOCATION@ + +-cross_compiling=@APR_CROSS_COMPILING@ +- +-if test "$cross_compiling" != "no"; then +- +- # Normalize $0 and bindir by removing consecutive '/' as the comparison +- # and the suffix removal below might fail for semantic equal pathes. +- # XXX: This is not perfect. On Linux we could use realpath for this purpose +- # but realpath is not portable. +- normalized_command=`echo $0 | tr -s /` +- normalized_bindir=`echo ${bindir} | tr -s /` +- # Remove trailing '/' +- normalized_bindir=${normalized_bindir%/} +- +- # absolute path, but not installed path - we're cross compiling +- case "$normalized_command" in +- "${normalized_bindir}/"*) ;; +- "/"*) location=crosscompile; +- APR_TARGET_DIR=${normalized_command%${normalized_bindir}/apr-${APR_MAJOR_VERSION}-config}; +- ;; +- *) ;; +- esac +-fi ++# absolute path, but not installed path - we're cross compiling ++case "$0" in ++ "${bindir}/"*) ;; ++ "/"*) location=crosscompile; ++ APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; ++ *) ;; ++esac + + show_usage() + { +diff --git a/configure.in b/configure.in +index ff92e55..d9898c5 100644 +--- a/configure.in ++++ b/configure.in +@@ -140,18 +140,6 @@ fi + + AC_SUBST(APR_CONFIG_LOCATION) + +-if test "x$host_alias" != x; then +- if test "x$build_alias" = x; then +- APR_CROSS_COMPILING=maybe +- elif test "x$build_alias" != "x$host_alias"; then +- APR_CROSS_COMPILING=yes +- fi +-else +- APR_CROSS_COMPILING=no +-fi +- +-AC_SUBST(APR_CROSS_COMPILING) +- + # Libtool might need this symbol -- it must point to the location of + # the generated libtool script (not necessarily the "top" build dir). + # +-- +2.45.2 +
package/apr/0003-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch renamed from package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch +0 -0
package/apr/0004-Revert-Add-the-ability-to-cross-compile-APR.patch renamed from package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch +0 -0
package/apr/apr.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 -sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.4.tar.bz2.sha256 +sha256 fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577 apr-1.7.4.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
package/apr/apr.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.2 +APR_VERSION = 1.7.4 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0
Signature · 6 lines
2.45.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot