diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/openssl/depend | 2 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Oct 28 15:32:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * load.c (ruby_init_ext): share feature names between frame name and diff --git a/ext/openssl/depend b/ext/openssl/depend index 35574e479f..7991159f2e 100644 --- a/ext/openssl/depend +++ b/ext/openssl/depend @@ -3,4 +3,4 @@ $(OBJS): $(HDRS) $(ruby_headers) \ $(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 diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 986ee16cfe..e272cba092 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -154,5 +154,7 @@ have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTH 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" |