https://git.ruby-lang.org/ruby.git/commit/?id=939f8c0e66

From 939f8c0e665f49ce7b438b796a2e4b2785f290d8 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 15:35:24 +0900
Subject: merge revision(s) de9c612d6342ae2ea5ae1e46b27abecf17c439b5:

	Also the tests should use the configured pkg-config

	---
	 test/mkmf/test_pkg_config.rb | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)
---
 test/mkmf/test_pkg_config.rb | 4 ++--
 version.h                    | 2 +-
 2 files changed, 3 insertions(+), 3 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
 
diff --git a/version.h b/version.h
index f2c7dd10fc..2f8e036594 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 148
+#define RUBY_PATCHLEVEL 149
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3


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