mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-24 05:11:08 +02:00
github #51: Fix configure for cross build.
In order to detect equivalence b/w various rlimit values, use compile tests instead of run tests. This enables configure script to run in cross-build environment without any side effects. From NetBSD/pkgsrc: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/shells/zsh/patches/
This commit is contained in:
parent
508b47c750
commit
aa93901db2
3 changed files with 27 additions and 71 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2020-03-22 Rin Okuyama <rokuyama.rk@gmail.com>
|
||||||
|
|
||||||
|
* github #51: aczsh.m4, configure.ac: Fix configure for cross
|
||||||
|
build.
|
||||||
|
|
||||||
2020-03-22 Peter Stephenson <p.w.stephenson@ntlworld.com>
|
2020-03-22 Peter Stephenson <p.w.stephenson@ntlworld.com>
|
||||||
|
|
||||||
* 45601: Test/E02xtrace.ztst: Fix status in new functions -T
|
* 45601: Test/E02xtrace.ztst: Fix status in new functions -T
|
||||||
|
|
19
aczsh.m4
19
aczsh.m4
|
@ -688,3 +688,22 @@ if test $zsh_cv_have_$1 = yes; then
|
||||||
AC_DEFINE(HAVE_$1)
|
AC_DEFINE(HAVE_$1)
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
|
dnl Check whether rlmit $1, e.g. AS, is the same as rlmit $3, e.g. VMEM.
|
||||||
|
dnl $2 is lowercase $1, $4 is lowercase $3.
|
||||||
|
AC_DEFUN(zsh_LIMITS_EQUAL,
|
||||||
|
[AH_TEMPLATE([RLIMIT_]$1[_IS_]$3,
|
||||||
|
[Define to 1 if RLIMIT_]$1[ and RLIMIT_]$3[ both exist and are equal.])
|
||||||
|
AC_CACHE_CHECK([if RLIMIT_]$1[ and RLIMIT_]$3[ are the same],
|
||||||
|
zsh_cv_rlimit_$2_is_$4,
|
||||||
|
[AC_TRY_COMPILE([
|
||||||
|
#include <sys/types.h>
|
||||||
|
#ifdef HAVE_SYS_TIME_H
|
||||||
|
#include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/resource.h>],
|
||||||
|
[static char x[(RLIMIT_$1 == RLIMIT_$3)? 1 : -1]],
|
||||||
|
zsh_cv_rlimit_$2_is_$4=yes,
|
||||||
|
zsh_cv_rlimit_$2_is_$4=no)])
|
||||||
|
if test x$zsh_cv_rlimit_$2_is_$4 = xyes; then
|
||||||
|
AC_DEFINE(RLIMIT_$1_IS_$3)
|
||||||
|
fi])
|
||||||
|
|
74
configure.ac
74
configure.ac
|
@ -1936,77 +1936,9 @@ zsh_LIMIT_PRESENT(RLIMIT_SWAP)
|
||||||
zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
|
zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
|
||||||
zsh_LIMIT_PRESENT(RLIMIT_UMTXP)
|
zsh_LIMIT_PRESENT(RLIMIT_UMTXP)
|
||||||
|
|
||||||
AH_TEMPLATE([RLIMIT_VMEM_IS_RSS],
|
zsh_LIMITS_EQUAL(VMEM, vmem, RSS, rss)
|
||||||
[Define to 1 if RLIMIT_VMEM and RLIMIT_RSS both exist and are equal.])
|
zsh_LIMITS_EQUAL(VMEM, vmem, AS, as)
|
||||||
AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_RSS are the same,
|
zsh_LIMITS_EQUAL(RSS, rss, AS, as)
|
||||||
zsh_cv_rlimit_vmem_is_rss,
|
|
||||||
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
|
||||||
#include <sys/types.h>
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/resource.h>
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
int ret = 1;
|
|
||||||
#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS)
|
|
||||||
if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0;
|
|
||||||
#endif
|
|
||||||
return ret;
|
|
||||||
}]])],[zsh_cv_rlimit_vmem_is_rss=yes],[zsh_cv_rlimit_vmem_is_rss=no],[zsh_cv_rlimit_vmem_is_rss=no])])
|
|
||||||
|
|
||||||
if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
|
|
||||||
AC_DEFINE(RLIMIT_VMEM_IS_RSS)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
AH_TEMPLATE([RLIMIT_VMEM_IS_AS],
|
|
||||||
[Define to 1 if RLIMIT_VMEM and RLIMIT_AS both exist and are equal.])
|
|
||||||
AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_AS are the same,
|
|
||||||
zsh_cv_rlimit_vmem_is_as,
|
|
||||||
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
|
||||||
#include <sys/types.h>
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/resource.h>
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
int ret = 1;
|
|
||||||
#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS)
|
|
||||||
if (RLIMIT_AS == RLIMIT_VMEM) ret = 0;
|
|
||||||
#endif
|
|
||||||
return ret;
|
|
||||||
}]])],[zsh_cv_rlimit_vmem_is_as=yes],[zsh_cv_rlimit_vmem_is_as=no],[zsh_cv_rlimit_vmem_is_as=no])])
|
|
||||||
|
|
||||||
if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
|
|
||||||
AC_DEFINE(RLIMIT_VMEM_IS_AS)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
AH_TEMPLATE([RLIMIT_RSS_IS_AS],
|
|
||||||
[Define to 1 if RLIMIT_RSS and RLIMIT_AS both exist and are equal.])
|
|
||||||
AC_CACHE_CHECK(if RLIMIT_RSS and RLIMIT_AS are the same,
|
|
||||||
zsh_cv_rlimit_rss_is_as,
|
|
||||||
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
|
||||||
#include <sys/types.h>
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/resource.h>
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
int ret = 1;
|
|
||||||
#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS)
|
|
||||||
if (RLIMIT_AS == RLIMIT_RSS) ret = 0;
|
|
||||||
#endif
|
|
||||||
return ret;
|
|
||||||
}]])],[zsh_cv_rlimit_rss_is_as=yes],[zsh_cv_rlimit_rss_is_as=no],[zsh_cv_rlimit_rss_is_as=no])])
|
|
||||||
|
|
||||||
if test x$zsh_cv_rlimit_rss_is_as = xyes; then
|
|
||||||
AC_DEFINE(RLIMIT_RSS_IS_AS)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
dnl --------------------------------------------
|
dnl --------------------------------------------
|
||||||
dnl Check for members of struct rusage
|
dnl Check for members of struct rusage
|
||||||
|
|
Loading…
Reference in a new issue