shyouhei	2010-11-22 16:21:30 +0900 (Mon, 22 Nov 2010)

  New Revision: 29854

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

  Log:
    Wed, 23 Jun 2010 12:48:31 +0000  kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
     merge revision(s) 28404,28595,28597:
     
     	* configure.in: avoid getcontext() overhead if possible.
     	  [ruby-core:27380][Bug #2553]
     	  Thanks, Joe Damato, Dan Peterson and Patrick Mohr.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>
    
    * configure.in: fix use_context condition inversion.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>
    
    Fix changelog of revision 28595
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

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

Index: ruby_1_8_7/configure.in
===================================================================
--- ruby_1_8_7/configure.in	(revision 29853)
+++ ruby_1_8_7/configure.in	(revision 29854)
@@ -522,7 +522,7 @@
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
 		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h time.h)
+		 intrinsics.h time.h)
 
 dnl Check additional types.
 AC_CHECK_SIZEOF(rlim_t, 0, [
@@ -1085,8 +1085,22 @@
        fi
     fi
 fi
-if test x"$ac_cv_header_ucontext_h" = xyes; then
-    if test x"$rb_with_pthread" = xyes; then
+
+use_context=no
+if test x"$rb_with_pthread" = xyes; then
+    AS_CASE("$target_cpu:$target_os:$cross_compiling",
+    [*:linux*:no], [
+        if test -n "`(/lib/libc.so.6 2>/dev/null | fgrep 'linuxthreads') 2> /dev/null`"; then
+	    use_context=yes
+	fi
+    ],
+    [sparc*], [
+    	use_context=yes
+    ])
+fi
+if test x"$use_context" = xyes; then
+    AC_CHECK_HEADERS(ucontext.h)
+    if test x"$ac_cv_header_ucontext_h" = xyes; then
 	AC_CHECK_FUNCS(getcontext setcontext)
     fi
 fi
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29853)
+++ ruby_1_8_7/ChangeLog	(revision 29854)
@@ -1,3 +1,14 @@
+Sat Jul 10 10:51:29 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* configure.in: fix use_context condition inversion.
+	[Bug #2553][ruby-core:31164]. Thanks, Andre Nathan. 
+
+Wed Jun 23 21:36:45 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: avoid getcontext() overhead if possible.
+	[ruby-core:27380][Bug #2553]
+	Thanks, Joe Damato, Dan Peterson and Patrick Mohr.
+
 Wed Jan 13 06:54:44 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: check for if struct timezone is defined.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29853)
+++ ruby_1_8_7/version.h	(revision 29854)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 303
+#define RUBY_PATCHLEVEL 304
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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