archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 613fca0148: [Backport #19189]

Browse source 
[Bug #19189] Fallback to the default "pkg-config"

	---
	 lib/mkmf.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
This commit is contained in:
nagachika 2023-02-23 15:14:27 +09:00
parent 9f072e9ae1
commit 0602df301c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/mkmf.rb
View file

@ -1866,7 +1866,7 @@ SRC
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", RbConfig::CONFIG["PKG_CONFIG"])) &&
(pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) &&
find_executable0(pkgconfig) && pkgconfig) and
xsystem([*envs, $PKGCONFIG, "--exists", pkg])
# default to pkg-config command

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 192
#define RUBY_PATCHLEVEL 193
#define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 2