From nobody Sat Oct 19 11:09:34 2024 X-Original-To: dev-commits-ports-main@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 4XVzNv19FZz5ZyD4; Sat, 19 Oct 2024 11:09:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVzNv0XQXz4BFj; Sat, 19 Oct 2024 11:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729336175; 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=EyeCopdi5mcFBw0vUHNw4Odyxfxa5bMkixUsyDmS1Jc=; b=pqE1InLgz0iWMx2O8GpgtGEvZgtGD3SDtG5jK4Wr5Qr1mCk0jauRbRXWZtOUBVngxsQ1sb uXM6FF0LhcBgC2hHiB1RUs0DJjT7LazPI37S0jfagmluhHTwh1EyTA+TdnRRG9vD8Da0g0 iD18iVhahchiZbirCCL43TIvUXbxm4hyfhfb5Zg9WtfLy/vTuoD2P+XcpBG4N/xnLfYtDa d8HrWJrLgj6SvGua+wGFqJLpFDK+b0f20T2sSmc6ZGScxj3BKMwyuGyBf2gz/gZP0Ap7zQ HQL5xmEkxGecpMli1XeRpQ0EWKsvcr6peIRfn6YsQogMHUrPyqDajQMoGJJR1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729336175; 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=EyeCopdi5mcFBw0vUHNw4Odyxfxa5bMkixUsyDmS1Jc=; b=mp+hz5p3b+7omu+hsJ8YGIdOdYLWBK4UxwUIrwLXv2Y2Lr8/EADoAEwFxeFNHiOAPOiRF8 VrWSeb+EVTIvLpJpnhsPhrw63Kiq4mp3I7ieIJlzWurzypoMrJONH7rkmCkE1CktMhyDM5 yxvFLdfwNIhxFP12poe4eu3IyiVJ+fz3r6gTjkMdbpdNeKIyJi7yGXYkWDhJUZU3OcgoMY QvtfxwBNeKZZRNdzwFoXcqi0SqSic45fuNBpuZ7d3Rv4u5CE7NGTJO1DBrzgx+wqYdT4Bi z8QA0h4taPuyD0UGxOJ0jtk49+jUXAzPEORK6ptNtLWpaauUxfaaZCpU0Qiwdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729336175; a=rsa-sha256; cv=none; b=nbLV235iX2dchg/vlAKjTTkWCSUpsf85P14iHK+douoZy5zty0auecRzsXbxK3EhlOd/sm Za6YKPFA2+xUo5643zu9ysgzq0TQ5ZqMETmJeLjCgnljiRPkT3hj/95XNWYUPgg0z1dXDB G9DiYcoXW9xD3rfqAYD1msqtE6scCUpbqfvvbBKQm3mVGuDZiErI559k6BIN5y0LxhJiri 3hTiNtWR84+pAD/H5h5rVood8pT4bmSDNVZjYFyDkO3uL5M5r3leGxBmoobZv0ciQ02tlE RJtBsm5YHD8tS4KFLxmwshIrSUgQit/vhcfOY6SAEcLYGEyC1mTZFc5pJd0ELQ== 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 4XVzNt6y8WzFk0; Sat, 19 Oct 2024 11:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49JB9Y5Y063507; Sat, 19 Oct 2024 11:09:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49JB9Yu2063504; Sat, 19 Oct 2024 11:09:34 GMT (envelope-from git) Date: Sat, 19 Oct 2024 11:09:34 GMT Message-Id: <202410191109.49JB9Yu2063504@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 782c642c8a10 - main - devel/rubygem-rugged: Unbreak with libgit2 1.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 782c642c8a10cdaeff59df09f00990e76d0392d5 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=782c642c8a10cdaeff59df09f00990e76d0392d5 commit 782c642c8a10cdaeff59df09f00990e76d0392d5 Author: Nuno Teixeira AuthorDate: 2024-10-19 11:08:21 +0000 Commit: Nuno Teixeira CommitDate: 2024-10-19 11:09:23 +0000 devel/rubygem-rugged: Unbreak with libgit2 1.8.1 Remove broken libgit2 detection PR: 280711 --- .../files/patch-ext_rugged_extconf.rb | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb b/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb new file mode 100644 index 000000000000..41fd2d2aed76 --- /dev/null +++ b/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb @@ -0,0 +1,37 @@ +# Remove broken libgit2 detection + +--- ext/rugged/extconf.rb.orig 2024-10-19 10:29:11 UTC ++++ ext/rugged/extconf.rb +@@ -65,32 +65,6 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_ + + if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES']) + puts "Building Rugged using system libraries.\n" +- +- dir_config('git2').any? or pkg_config('libgit2') +- +- major = minor = nil +- +- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line| +- if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/)) +- major = matches[1] +- next +- end +- +- if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/)) +- minor = matches[1] +- next +- end +- +- break if major && minor +- end +- +- try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0" +-#include +- +-#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor} +-#error libgit2 version is not compatible +-#endif +- SRC + else + if !find_executable('cmake') + abort "ERROR: CMake is required to build Rugged."