ruby-changes:73837
From: Nobuyoshi <ko1@a...>
Date: Sun, 2 Oct 2022 17:29:40 +0900 (JST)
Subject: [ruby-changes:73837] 7f1ca66642 (master): Fallback PKG_CONFIG to the configured pkg-config always
https://git.ruby-lang.org/ruby.git/commit/?id=7f1ca66642 From 7f1ca666424849134990d022266bcd4d6636465f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 11 Sep 2022 16:06:35 +0900 Subject: Fallback PKG_CONFIG to the configured pkg-config always --- lib/mkmf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 61ca9e53ac..86ba70ed19 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1866,7 +1866,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1866 if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) # if and only if package specific config command is given elsif ($PKGCONFIG ||= - (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) && + (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) && find_executable0(pkgconfig) && pkgconfig) and xsystem([*envs, $PKGCONFIG, "--exists", pkg]) # default to pkg-config command -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/