From 9598856e868be10661ac5aff827ef39f14e2aa2d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 27 Oct 2011 05:55:29 +0000 Subject: [PATCH] * configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as shell variable name. based on the patch by The Written Word Inc. at [ruby-core:40421]. [Bug #5488] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed53ba3e5b..4fe52f3d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 27 14:55:27 2011 Nobuyoshi Nakada + + * configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as + shell variable name. based on the patch by The Written Word Inc. at + [ruby-core:40421]. [Bug #5488] + Thu Oct 27 09:57:56 2011 NARUSE, Yui * include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined. diff --git a/configure.in b/configure.in index fff3a07eb0..f434d9be15 100644 --- a/configure.in +++ b/configure.in @@ -1726,7 +1726,8 @@ if test "$ac_cv_func_sysconf" = yes; then fi AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [ - AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [ + AS_VAR_PUSHDEF([stack_grow_dir], [rb_cv_stack_grow_dir_$1]) + AC_CACHE_CHECK(stack growing direction on $1, stack_grow_dir, [ AS_CASE(["$1"], [m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1], [hppa*], [ $2=+1], @@ -1750,8 +1751,9 @@ int main() } ], $2=-1, $2=+1, $2=0) ]) -eval rb_cv_stack_grow_dir_$1=\$$2]) -eval $2=\$rb_cv_stack_grow_dir_$1]) +eval stack_grow_dir=\$$2]) +eval $2=\$stack_grow_dir +AS_VAR_POPDEF([stack_grow_dir])]) if test "${universal_binary-no}" = yes ; then archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'` save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'` @@ -1772,7 +1774,7 @@ if test "${universal_binary-no}" = yes ; then if test x$stack_dir = xno; then for archs in ${universal_archnames}; do archs=`echo $archs | sed 's/=.*//'` - eval dir=\$rb_cv_stack_grow_dir_$archs + eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs]) RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir) done else