From nobody Sat Feb 11 06:01:11 2023 X-Original-To: dev-commits-ports-branches@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 4PDKjN20kqz3q2FB; Sat, 11 Feb 2023 06:01:12 +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 4PDKjN1LVgz3p2x; Sat, 11 Feb 2023 06:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676095272; 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=/ScDMi+0KlcWsplzG71qNE3H25pdWEI/u2roxZ4ncqc=; b=A5oUIvEwOmfnIzV3xZeiH15hbbnrK0FC+YD4vVTtm+sHQ2BhYcXR5RbQVUdBnnJV67FPsc jSzuml1/rgmQBm3jEd0TzRztFtWNXYzBdAtrku9hYPe3T0vImVnTdVZlMm+brAxdLp1b2d GjWouOZ5XM36qbiGs3BbIioKpWzDJMQYAuolZc0odIHJQ82MHxy4iu/GvSE1gmIwnW9TJo 6lsidC204bAcjZkcIfeMWMZqZMgJAX9pblTu0fEfWu07JEm/9kP/qz0a5exjpP7FxdefK/ fblGW79A3S1XXa9+BJw9tnd2ggv6CfPqWA7+hysVkGiuXlUerIgoDKcWiipUvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676095272; 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=/ScDMi+0KlcWsplzG71qNE3H25pdWEI/u2roxZ4ncqc=; b=bOusDLk/e75KQdL9fYbLM0IRCUfi1swaaaQXq1bKrj1crSVxnbY5Piha8gQebLwnL13b2D 7agMQK9KKg3v7nzMqUCPGwCP4Yg+vs2ukAg0/H2PB7tQm7SVCVkicYCfMdIK8uXgSCy3nm TD/beKVaM8npRVuNiVxo+rfM5bBFzRHzryaB138dqO8XmU36PsNfIYi+/iuLxkR9KnxvMA k3xEBBHVRWuMXptfOotUBmPd9g73jgcCgQ3896cpFIgQt6dLpYndgDEL0/yWrj/UXsp1Da WaRqveymLPm9jngYGJQnInOdIFOQWBrLq6RKKZXu+dUMbsFjVotr1r4IjDZbfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676095272; a=rsa-sha256; cv=none; b=P0MdXC0E9kR/1Er0TauSX7xUhaMWYiSDfM35/Ec3nXMBPzvQ7sgCATszX8Bt9eGqlhdMm0 Y/HOncY/CiMX1o/4DeYNmxJDHVFnTcPwvgrO7gMPxgy54K5pa4IRgPKDPIG91elYeN8Zsj TuvIcFJD4TincLQ3mNOQXgC4RXc7tLqznH+TmwUXSIglkjVn2cM75pLCYL100PewhPqpD6 bD0BaqO/haHyIBvrN3MHvdk7h6giD0kPB0/SAnQtXWFCvnr33ROnw7QpNBoh+SwFRc1KbM wfNKIkXznzR9CGbgJYfUSut0HWI7y6GHqVqa/Nw8HyiuzL+e3+n9Su3CVV9EUg== 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 4PDKjN0LlNzngp; Sat, 11 Feb 2023 06:01:12 +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 31B61BR4059297; Sat, 11 Feb 2023 06:01:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31B61BGR059296; Sat, 11 Feb 2023 06:01:11 GMT (envelope-from git) Date: Sat, 11 Feb 2023 06:01:11 GMT Message-Id: <202302110601.31B61BGR059296@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: fb4a68c58b46 - 2023Q1 - lang/ruby31: Add upstream patch to fix bug of mkmf library List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q1 X-Git-Reftype: branch X-Git-Commit: fb4a68c58b46091c845663699b59734fba937e92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb4a68c58b46091c845663699b59734fba937e92 commit fb4a68c58b46091c845663699b59734fba937e92 Author: Yasuhiro Kimura AuthorDate: 2023-01-28 05:35:34 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-02-11 06:00:36 +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 (cherry picked from commit fc1c752e8b1cfb6162b9243f275efbe33ec04757) --- Mk/bsd.ruby.mk | 2 +- lang/ruby31/files/patch-mkmf-pkg-config | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index a9a6ce42574e..054aae8112f5 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -146,7 +146,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 +