View | Details | Raw Unified | Return to bug 269197
Collapse All | Expand All

(-)b/Mk/Uses/ruby.mk (-1 / +1 lines)
Lines 162-168 RUBY_PORTREVISION= 0 Link Here
162
# Ruby 3.1
162
# Ruby 3.1
163
#
163
#
164
RUBY_DISTVERSION=	3.1.3
164
RUBY_DISTVERSION=	3.1.3
165
RUBY_PORTREVISION=	0
165
RUBY_PORTREVISION=	1
166
166
167
.      elif ${RUBY_VER} == 3.2
167
.      elif ${RUBY_VER} == 3.2
168
#
168
#
(-)b/lang/ruby31/files/patch-mkmf-pkg-config (-1 / +25 lines)
Added Link Here
0
- 
1
From 613fca01486e47dee9364a2fd86b5f5e77fe23c8 Mon Sep 17 00:00:00 2001
2
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
3
Date: Wed, 7 Dec 2022 22:14:44 +0900
4
Subject: [PATCH] [Bug #19189] Fallback to the default "pkg-config"
5
6
---
7
 lib/mkmf.rb | 2 +-
8
 1 file changed, 1 insertion(+), 1 deletion(-)
9
10
diff --git lib/mkmf.rb lib/mkmf.rb
11
index e94733c635..0fbc1cc2e5 100644
12
--- lib/mkmf.rb
13
+++ lib/mkmf.rb
14
@@ -1866,7 +1866,7 @@ def pkg_config(pkg, *options)
15
     if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
16
       # if and only if package specific config command is given
17
     elsif ($PKGCONFIG ||=
18
-           (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) &&
19
+           (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) &&
20
            find_executable0(pkgconfig) && pkgconfig) and
21
         xsystem([*envs, $PKGCONFIG, "--exists", pkg])
22
       # default to pkg-config command
23
-- 
24
2.39.1
25

Return to bug 269197