You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2020/03/10 22:43:11 UTC
svn commit: r1875066 - in /apr/apr/branches/1.7.x: ./ CHANGES build/
build/apr_common.m4
Author: minfrin
Date: Tue Mar 10 22:43:11 2020
New Revision: 1875066
URL: http://svn.apache.org/viewvc?rev=1875066&view=rev
Log:
Backport r1875065
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.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/CHANGES
apr/apr/branches/1.7.x/build/ (props changed)
apr/apr/branches/1.7.x/build/apr_common.m4
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1875065
Modified: apr/apr/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CHANGES?rev=1875066&r1=1875065&r2=1875066&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.7.x/CHANGES [utf-8] Tue Mar 10 22:43:11 2020
@@ -1,6 +1,13 @@
-*- coding: utf-8 -*-
Changes for APR 1.7.1
+ *) 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. [Sebastian Kemper
+ <sebastian_ml gmx net>]
+
*) Add a cache check with which users who cross-compile APR
can influence the outcome of the /dev/zero test by setting the variable
ac_cv_mmap__dev_zero=yes [Sebastian Kemper <sebastian_ml gmx net>]
Propchange: apr/apr/branches/1.7.x/build/
------------------------------------------------------------------------------
Merged /apr/apr/trunk/build:r1875065
Modified: apr/apr/branches/1.7.x/build/apr_common.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/build/apr_common.m4?rev=1875066&r1=1875065&r2=1875066&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/build/apr_common.m4 (original)
+++ apr/apr/branches/1.7.x/build/apr_common.m4 Tue Mar 10 22:43:11 2020
@@ -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