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

ruby-changes:50503

From: nobu <ko1@a...>
Date: Fri, 2 Mar 2018 23:45:33 +0900 (JST)
Subject: [ruby-changes:50503] nobu:r62637 (trunk): openssl: search winsock

nobu	2018-03-02 23:45:28 +0900 (Fri, 02 Mar 2018)

  New Revision: 62637

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62637

  Log:
    openssl: search winsock
    
    * ext/openssl/extconf.rb: on Windows search winsock library
      always, regardless pkg-config.  direct use of winsock is not
      region of OpenSSL.  [ruby-core:85895] [Bug #14568]

  Modified files:
    trunk/ext/openssl/extconf.rb
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 62636)
+++ ext/openssl/extconf.rb	(revision 62637)
@@ -33,6 +33,9 @@ end https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L33
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
+if $mswin || $mingw
+  have_library("ws2_32")
+end
 
 Logging::message "=== Checking for required stuff... ===\n"
 result = pkg_config("openssl") && have_header("openssl/ssl.h")
@@ -40,7 +43,6 @@ result = pkg_config("openssl") && have_h https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L43
 def find_openssl_library
   if $mswin || $mingw
     # required for static OpenSSL libraries
-    have_library("ws2_32")
     have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
     have_library("crypt32")
   end

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

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