[前][次][番号順一覧][スレッド一覧]

ruby-changes:23099

From: nobu <ko1@a...>
Date: Tue, 27 Mar 2012 22:23:14 +0900 (JST)
Subject: [ruby-changes:23099] nobu:r35149 (ruby_1_9_3): merge revision(s) 33533: [Backport #6204]

nobu	2012-03-27 22:23:02 +0900 (Tue, 27 Mar 2012)

  New Revision: 35149

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35149

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 35148)
+++ ruby_1_9_3/configure.in	(revision 35149)
@@ -1759,7 +1759,8 @@
 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 @@
 }
 ], $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 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
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35148)
+++ ruby_1_9_3/ChangeLog	(revision 35149)
@@ -1,3 +1,9 @@
+Tue Mar 27 22:22:50 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* parse.y (parser_nextc): set encoding for the buffer of ripper.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35148)
+++ ruby_1_9_3/version.h	(revision 35149)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]