diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-27 13:23:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-27 13:23:02 +0000 |
| commit | c857c7379c8f08d8ca985efa40e8682ab4686984 (patch) | |
| tree | 6daa0e48a0d42336a8fd94c366470065f755080d | |
| parent | c34b551c0348332e6d36cc4685db7b4d7a39ca9d (diff) | |
merge revision(s) 33533: [Backport #6204]
* 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/branches/ruby_1_9_3@35149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Tue Mar 27 22:22:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Mon Mar 26 09:57:12 2012 NARUSE, Yui <naruse@ruby-lang.org> * parse.y (parser_nextc): set encoding for the buffer of ripper. diff --git a/configure.in b/configure.in index 8678413821..9632860d3b 100644 --- a/configure.in +++ b/configure.in @@ -1759,7 +1759,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], @@ -1783,8 +1784,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"'||'` @@ -1805,7 +1807,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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 166 +#define RUBY_PATCHLEVEL 167 -#define RUBY_RELEASE_DATE "2012-03-26" +#define RUBY_RELEASE_DATE "2012-03-27" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" |