ruby-changes:73839
From: Nobuyoshi <ko1@a...>
Date: Sun, 2 Oct 2022 17:29:41 +0900 (JST)
Subject: [ruby-changes:73839] de9c612d63 (master): Also the tests should use the configured pkg-config
https://git.ruby-lang.org/ruby.git/commit/?id=de9c612d63 From de9c612d6342ae2ea5ae1e46b27abecf17c439b5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 11 Sep 2022 16:40:20 +0900 Subject: Also the tests should use the configured pkg-config --- test/mkmf/test_pkg_config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/mkmf/test_pkg_config.rb b/test/mkmf/test_pkg_config.rb index 72efb4ba81..f6a960c7d9 100644 --- a/test/mkmf/test_pkg_config.rb +++ b/test/mkmf/test_pkg_config.rb @@ -3,7 +3,7 @@ require_relative 'base' https://github.com/ruby/ruby/blob/trunk/test/mkmf/test_pkg_config.rb#L3 require 'shellwords' class TestMkmfPkgConfig < TestMkmf - PKG_CONFIG = find_executable0("pkg-config") + PKG_CONFIG = config_string("PKG_CONFIG") {|path| find_executable0(path)} def setup super @@ -26,7 +26,7 @@ class TestMkmfPkgConfig < TestMkmf https://github.com/ruby/ruby/blob/trunk/test/mkmf/test_pkg_config.rb#L26 Cflags: -I${includedir}/cflags-I --cflags-other EOF - @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], File.join(Dir.pwd, "fixtures") + @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], @fixtures_dir end end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/