From nobody Fri Nov 15 15:57:53 2024 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 4XqhW63xcvz5dJK6; Fri, 15 Nov 2024 15:57:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqhW60Qdmz4CWp; Fri, 15 Nov 2024 15:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686274; 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=Qr6If/yl7agt/5czU9lNetNgxXQAV/+Ekr9NXm2Ypv0=; b=tsOH1RGgQZzDT6dCrEeCVTiqA/0jpstMKBkhXq/sdRGAUHVeCwXFJ9JC11ih/hbNToH6cC WFoifmmLEw+WSXF0w23P2Dys6E+CaeeqZXyNEHMmeyOwZp3x9164RTii2tgOjhuGUDrha8 cwW5uRmnlZ8oc7qK0JuoobZ7/MmgQl5R4wtvnIPjNVfwulsB9iDKJEBrltltKNeBe0ME3m OdNHDjMMAnnir7J2xS62eMtlIG9i9Nxao+s7h91YJ2f1BBkL7w+ZEigOomK3wimGa8X61G gqe4wyPOSEhXIiBhNiD/hZ0vBZ/YLyhPQQx+2x2fydAKpMv8e5ZbCPycMfQoEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686274; 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=Qr6If/yl7agt/5czU9lNetNgxXQAV/+Ekr9NXm2Ypv0=; b=VhptH+DcCmrAoxT2hDfDlIx71AFcJcNXEOCrXdSOW1y9sXHZ7JlvhKunvmSuzx8XQHhbOc Z2iVkY9XMHMW10gzIOWcXjzoawaw/4CxjfQHVI2UMOw+Px9NIHoyCToJEJ1B0iHGeP4DvM VhSY6NRi+QJYYAy7VO8WGsC5vz/ttZbBkUbq4QKZ/z95cdfGdUqhJ1T0hiovMiEragX9wH lVKJPb6QoJlbzyT2+a7oDIeomsyRbze3tJrApQGjuMnHV0ch+RlN3orprugl/hDR+LpPOj 61wKFE4CvIgMSvu2jMVZgJt8Iiv6H+rVwAdyK+YC3xPsQFf8FQhoEmLF+iz4LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686274; a=rsa-sha256; cv=none; b=wNGuXa/P7S7dOp4HrQYEojqqbg9dNTJsB9Mszza2IQrTmrWZlshxKvE/3paw24D+LgOUWG eIynav4En8Pot8/IGZrYGYjKEv80VfUDD2tIImAUPeQxiZu/YTxt40+0kdLvVhKpQ+yt84 cF8QfAPCiB8DiRIRUn0F8FNhdpx4qO81/lhADuX6Pl20WY2SDoio79hErnch0h9lFJKyYs 3jvd8SzORy5jXpkeChUM52Usj8ae9gURRMM9yg6eauJQMi911sZNWDRC0cCMKr4A+vbpRV 82PszQCZikUrEPAjCNxxdXO1BJXLP5PCj740Fc9s5nJ8w0KpW6R033uv7siB9Q== 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 4XqhW56gFSzTxW; Fri, 15 Nov 2024 15:57:53 +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 4AFFvrfH094717; Fri, 15 Nov 2024 15:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvrWm094714; Fri, 15 Nov 2024 15:57:53 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:53 GMT Message-Id: <202411151557.4AFFvrWm094714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: e13de6f971e3 - 2024Q4 - devel/rubygem-rugged: Unbreak with libgit2 1.8.1 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: e13de6f971e369ee115557596ad1dd378dba4bcd Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e13de6f971e369ee115557596ad1dd378dba4bcd commit e13de6f971e369ee115557596ad1dd378dba4bcd Author: Nuno Teixeira AuthorDate: 2024-10-19 11:08:21 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:44 +0000 devel/rubygem-rugged: Unbreak with libgit2 1.8.1 Remove broken libgit2 detection PR: 280711 (cherry picked from commit 782c642c8a10cdaeff59df09f00990e76d0392d5) --- .../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."