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

ruby-changes:22591

From: naruse <ko1@a...>
Date: Thu, 16 Feb 2012 09:26:21 +0900 (JST)
Subject: [ruby-changes:22591] naruse:r34640 (ruby_1_9_3): merge revision(s) 32730:

naruse	2012-02-16 09:26:09 +0900 (Thu, 16 Feb 2012)

  New Revision: 34640

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

  Log:
    merge revision(s) 32730:
    
    * configure.in (enable_pthread): use -pthread on OpenBSD without
      explicit option. patched by Jeremy Evans. [ruby-core:38572]

  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 34639)
+++ ruby_1_9_3/configure.in	(revision 34640)
@@ -1829,7 +1829,9 @@
 	[c],    [],
 	[root], [],
 	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
-	        [LIBS="-l$pthread_lib $LIBS"])
+	        [AS_CASE(["$target_os"],
+		    [openbsd*], [LIBS="-pthread $LIBS"],
+		    [LIBS="-l$pthread_lib $LIBS"])])
     else
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     fi
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34639)
+++ ruby_1_9_3/ChangeLog	(revision 34640)
@@ -1,3 +1,8 @@
+Thu Feb 16 09:25:52 2012  NARUSE, Yui  <naruse@r...>
+
+	* configure.in (enable_pthread): use -pthread on OpenBSD without
+	  explicit option. patched by Jeremy Evans. [ruby-core:38572]
+
 Thu Feb 16 07:34:34 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* cont.c (rb_fiber_reset_root_local_storage): add a new function to
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34639)
+++ ruby_1_9_3/version.h	(revision 34640)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 123
+#define RUBY_PATCHLEVEL 124
 
 #define RUBY_RELEASE_DATE "2012-02-16"
 #define RUBY_RELEASE_YEAR 2012

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

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