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

ruby-changes:72471

From: Stefan <ko1@a...>
Date: Sat, 9 Jul 2022 00:31:54 +0900 (JST)
Subject: [ruby-changes:72471] 0bf2dfa6ac (master): [ruby/openssl] ignore pkgconfig when any openssl option is specified

https://git.ruby-lang.org/ruby.git/commit/?id=0bf2dfa6ac

From 0bf2dfa6ac52b8c98116b2dba1225f9da12eb42f Mon Sep 17 00:00:00 2001
From: Stefan Kaes <stefan.kaes@x...>
Date: Tue, 4 Jan 2022 13:28:26 +0100
Subject: [ruby/openssl] ignore pkgconfig when any openssl option is specified

https://github.com/ruby/openssl/commit/b23fa75aa3
---
 ext/openssl/extconf.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 26abfc8b2a..d014c60306 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -13,7 +13,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L13
 
 require "mkmf"
 
-dir_config("openssl")
+dir_config_given = dir_config("openssl").any?
 dir_config("kerberos")
 
 Logging::message "=== OpenSSL for Ruby configurator ===\n"
@@ -92,7 +92,7 @@ def find_openssl_library https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L92
 end
 
 Logging::message "=== Checking for required stuff... ===\n"
-pkg_config_found = pkg_config("openssl") && have_header("openssl/ssl.h")
+pkg_config_found = !dir_config_given && pkg_config("openssl") && have_header("openssl/ssl.h")
 
 if !pkg_config_found && !find_openssl_library
   Logging::message "=== Checking for required stuff failed. ===\n"
-- 
cgit v1.2.1


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

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