980707ac10
Backport a bunch of patches that fixes build when using new Autoconf and Automake. The patches removed are replaced by upstream backports which are more complete. Signed-off-by: Michael Pratt <mcpratt@pm.me>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 5fd2568c34a8d5c8159d9a5e0f5601f9e8902166
|
|
From: Graham Leggett <minfrin@apache.org>
|
|
Date: Tue, 10 Mar 2020 22:38:59 +0000
|
|
Subject: [PATCH] APR's configure script uses AC_TRY_RUN to detect whether the
|
|
return type of strerror_r is int. When cross-compiling this defaults to no.
|
|
|
|
This commit adds an AC_CACHE_CHECK so users who cross-compile APR may
|
|
influence the outcome with a configure variable.
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1875065 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
CHANGES | 7 +++++++ (OPENWRT REMOVED)
|
|
build/apr_common.m4 | 11 ++++-------
|
|
2 files changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
--- a/build/apr_common.m4
|
|
+++ b/build/apr_common.m4
|
|
@@ -489,8 +489,9 @@ dnl string.
|
|
dnl
|
|
dnl
|
|
AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
|
|
-AC_MSG_CHECKING(for type of return code from strerror_r)
|
|
-AC_TRY_RUN([
|
|
+AC_CACHE_CHECK([whether return code from strerror_r has type int],
|
|
+[ac_cv_strerror_r_rc_int],
|
|
+[AC_TRY_RUN([
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
@@ -506,14 +507,10 @@ main()
|
|
}], [
|
|
ac_cv_strerror_r_rc_int=yes ], [
|
|
ac_cv_strerror_r_rc_int=no ], [
|
|
- ac_cv_strerror_r_rc_int=no ] )
|
|
+ ac_cv_strerror_r_rc_int=no ] ) ] )
|
|
if test "x$ac_cv_strerror_r_rc_int" = xyes; then
|
|
AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
|
|
- msg="int"
|
|
-else
|
|
- msg="pointer"
|
|
fi
|
|
-AC_MSG_RESULT([$msg])
|
|
] )
|
|
|
|
dnl
|