From nobody Sat Feb 11 05:59:20 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PDKgF2DLVz3q1wZ; Sat, 11 Feb 2023 05:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PDKgF1ZW7z3nqM; Sat, 11 Feb 2023 05:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676095161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ngAhc/aq/0n31CUTv4E6uq8GoUuElEfCQuE0e48xRz0=; b=x8I9ZmX12XCM1cel23sp9EhBgzX3HPvd0mHjRCwiFIYSKA4hsGgTNRZZD94/ATdxpmjRF4 4K7MsNaUp2KTSuWg9b/XRjRzuG031gp3lH13aULJV1bpPlbNLFkOQtBj2C//elXmmrUHY3 dWShzbZWmJnqNtdzOEMXLLeTccoQOA4+Md8e1GncIWqaGhQMl+AF6PMQsQYZ11TToA5waU G9h92axnFHkqkg01e0NkB5lJ7LMzyonz2PmZaVc3mYSKfSBhaHpYCaeBDuCfWR//CqARtQ KliahIuAZlKipmCKiq8C11cafVBPH6hDebcoJvkk8qmAQ+GsAu7GUrUcX8oHAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676095161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ngAhc/aq/0n31CUTv4E6uq8GoUuElEfCQuE0e48xRz0=; b=IWa2EV+o7OtWzMRQewDUgAJaUL7KU6fBEwKf+8FgTmaC+czZMNMSN2b3LjOlgQ8xgG3cGG MIMOrVSlUrY57qBw7zbfaebDOAEmdGSicPZguhDxV6DUFh2QtGX6xXRILAEwJ58NRysyMR hjH272XPwf8Abb6n9FRyx5UEOaMjp+s5p9xxV6eCQPcSZ381eZOL6ZeZlKZN8uMIlhI1mV 1VpjJ81StgHeG5L5lgIrpTDDtwganIWL3P2r6CDhxXc5ZYC8K7LCWpOjxAR57Tvz8hU60+ cA4mv8oW0MBhdq9m9stKBD8qg6TOGjtHOeah8+3U0cuHtMaad1dat007CHyBaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676095161; a=rsa-sha256; cv=none; b=vc9wnsTGFJpC2mg8vaufILMnsCqkhlY1/ylUhFJjd+zADF8YLsRFKqzvzh1vaBFFCFAkHs 1jesUO8ZtTTxEz3CT8Z0ZGl1FgVohD6QnTWvht3vE+kGsupEkwMtuIQBeH4ae6zHY/VJ3y TPvhxO/VASS91jiYcOicMHTZM2yZnuJR4w0SAP/GJH8YdSuLellK+ae8ujvyc5vTxK5hST NlLWCCxLmKMj7SzXV3Tc421nNEpVB5xlf85FkxJ1oYApbx/CCRM9aF98+mkeYA62JPQNYn nvECKfHehUBhLSgQHDtkb4rA5B5IFk3JGLhrsFNGV1IAGVYc5nk4rKBpbSVIbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PDKgF0cZwznVn; Sat, 11 Feb 2023 05:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31B5xKdi047152; Sat, 11 Feb 2023 05:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31B5xKo1047151; Sat, 11 Feb 2023 05:59:20 GMT (envelope-from git) Date: Sat, 11 Feb 2023 05:59:20 GMT Message-Id: <202302110559.31B5xKo1047151@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: fc1c752e8b1c - main - lang/ruby31: Add upstream patch to fix bug of mkmf library List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc1c752e8b1cfb6162b9243f275efbe33ec04757 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc1c752e8b1cfb6162b9243f275efbe33ec04757 commit fc1c752e8b1cfb6162b9243f275efbe33ec04757 Author: Yasuhiro Kimura AuthorDate: 2023-01-28 05:35:34 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-02-11 05:59:02 +0000 lang/ruby31: Add upstream patch to fix bug of mkmf library There is bug in mkmf library of Ruby 3.1 that it fails to detect pkg-config command if it isn't installed in environment that Ruby is built, and it causes build error of some ports when default version of Ruby is 3.1. So add upstream patch to fix it. Reference: https://bugs.ruby-lang.org/issues/19189 PR: 269197 Approved by: maintainer timeout MFH: 2023Q1 --- Mk/Uses/ruby.mk | 2 +- lang/ruby31/files/patch-mkmf-pkg-config | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index da2e4ea30a4e..46b76fd7e423 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -162,7 +162,7 @@ RUBY_PORTREVISION= 0 # Ruby 3.1 # RUBY_DISTVERSION= 3.1.3 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 . elif ${RUBY_VER} == 3.2 # diff --git a/lang/ruby31/files/patch-mkmf-pkg-config b/lang/ruby31/files/patch-mkmf-pkg-config new file mode 100644 index 000000000000..f966b82eadb1 --- /dev/null +++ b/lang/ruby31/files/patch-mkmf-pkg-config @@ -0,0 +1,25 @@ +From 613fca01486e47dee9364a2fd86b5f5e77fe23c8 Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada +Date: Wed, 7 Dec 2022 22:14:44 +0900 +Subject: [PATCH] [Bug #19189] Fallback to the default "pkg-config" + +--- + lib/mkmf.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git lib/mkmf.rb lib/mkmf.rb +index e94733c635..0fbc1cc2e5 100644 +--- lib/mkmf.rb ++++ lib/mkmf.rb +@@ -1866,7 +1866,7 @@ def pkg_config(pkg, *options) + 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.39.1 +