783cd8d90d
- remove 0001-cross-compile.patch
(superseded by upstream commit [1])
- rename 0002-sys-param-h.patch to 0001-sys-param-h.patch
- remove 0003-Merge-r1887279-from-trunk.patch
(from upstream [2])
- remove 0004-apr-1.7.0-CVE-2021-35940.patch
(superseded by upstream commit [3], remove APR_IGNORE_CVES accordingly)
- set new configure option '--disable-sctp' (no libsctp provided by buildroot)
- set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for
cross compile)
- set new 'ac_cv_mmap__dev_zero' explicitly to yes
- revert two upstream commits ([4], [5]) to fix apr-util build, fails
otherwise because of some path mismatch where to find apr_rules.mk copied
to apr-util-1.6.3/build/rules.mk, fixes:
Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory
For details see [6].
[1] 866e1df66b
[2] 0a763c5e50
[3] e0be630b68
[4] f82374627b
[5] b6dbbc77da
[6] https://downloads.apache.org/apr/CHANGES-APR-1.7
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001
|
|
From: Graham Leggett <minfrin@apache.org>
|
|
Date: Wed, 1 Jan 2020 10:43:39 +0000
|
|
Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when
|
|
cross compiling.
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
apr-config.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/apr-config.in b/apr-config.in
|
|
index bed47ca..4873fc0 100644
|
|
--- a/apr-config.in
|
|
+++ b/apr-config.in
|
|
@@ -246,7 +246,7 @@ while test $# -gt 0; do
|
|
if test "$location" = "installed"; then
|
|
echo "${installbuilddir}/libtool"
|
|
elif test "$location" = "crosscompile"; then
|
|
- echo "$APR_TARGET_DIR/${installbuilddir}/libtool"
|
|
+ echo "$APR_TARGET_DIR/${installbuilddir}/build"
|
|
else
|
|
echo "$APR_BUILD_DIR/libtool"
|
|
fi
|
|
--
|
|
2.39.2
|
|
|