nobu	2013-10-28 15:32:24 +0900 (Mon, 28 Oct 2013)

  New Revision: 43451

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

  Log:
    openssl: work around of dependency
    
    * ext/openssl/depend (ossl.o): work around of dependency of
      thread_native.h, which depends on headers by THREAD_MODEL.
      [ruby-dev:47777]
    * ext/openssl/extconf.rb: need THREAD_MODEL.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/depend
    trunk/ext/openssl/extconf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43450)
+++ ChangeLog	(revision 43451)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Oct 28 15:32:18 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/openssl/depend (ossl.o): work around of dependency of
+	  thread_native.h, which depends on headers by THREAD_MODEL.
+	  [ruby-dev:47777]
+
+	* ext/openssl/extconf.rb: need THREAD_MODEL.
+
 Mon Oct 28 14:57:01 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (ruby_init_ext): share feature names between frame name and
Index: ext/openssl/depend
===================================================================
--- ext/openssl/depend	(revision 43450)
+++ ext/openssl/depend	(revision 43451)
@@ -3,4 +3,4 @@ $(OBJS): $(HDRS) $(ruby_headers) \ https://github.com/ruby/ruby/blob/trunk/ext/openssl/depend#L3
   $(hdrdir)/ruby/encoding.h \
   $(hdrdir)/ruby/oniguruma.h \
   $(hdrdir)/ruby/thread.h
-ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_pthread.h
+ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_$(THREAD_MODEL).h
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 43450)
+++ ext/openssl/extconf.rb	(revision 43451)
@@ -154,5 +154,7 @@ have_macro("EVP_CTRL_GCM_GET_TAG", ['ope https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L154
 Logging::message "=== Checking done. ===\n"
 
 create_header
-create_makefile("openssl")
+create_makefile("openssl") {|conf|
+  conf << "THREAD_MODEL = #{CONFIG["THREAD_MODEL"]}\n"
+}
 Logging::message "Done.\n"

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