From patchwork Thu Mar 31 17:11:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 38252 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4E11F27BBE9; Thu, 31 Mar 2022 18:20:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 058EB27BBEA for ; Thu, 31 Mar 2022 18:20:48 +0100 (BST) Received: from localhost ([::1]:57394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZyTX-0003Nx-5d for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 13:20:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZyL4-0005Db-TA for guix-patches@gnu.org; Thu, 31 Mar 2022 13:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZyL4-0003ht-K9 for guix-patches@gnu.org; Thu, 31 Mar 2022 13:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZyL4-0003pq-Dc for guix-patches@gnu.org; Thu, 31 Mar 2022 13:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54611] [WIP PATCH] gnu: Update libgit2 to 1.4.2 Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Mar 2022 17:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54611 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54611@debbugs.gnu.org Received: via spool by 54611-submit@debbugs.gnu.org id=B54611.164874667614686 (code B ref 54611); Thu, 31 Mar 2022 17:12:02 +0000 Received: (at 54611) by debbugs.gnu.org; 31 Mar 2022 17:11:16 +0000 Received: from localhost ([127.0.0.1]:39656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZyKK-0003on-Hq for submit@debbugs.gnu.org; Thu, 31 Mar 2022 13:11:16 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZyKI-0003of-Ln for 54611@debbugs.gnu.org; Thu, 31 Mar 2022 13:11:15 -0400 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by laurent.telenet-ops.be with bizsmtp id D5BC2700G4UW6Th015BCBm; Thu, 31 Mar 2022 19:11:12 +0200 Message-ID: From: Maxime Devos Date: Thu, 31 Mar 2022 19:11:08 +0200 In-Reply-To: <14826dd444a41d7b9c834ea08a960c7a2550da67.camel@telenet.be> References: <0035734f12073a2f50d41641f66dacc35e2e6a2c.camel@telenet.be> <14826dd444a41d7b9c834ea08a960c7a2550da67.camel@telenet.be> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1648746673; bh=u3/jcbw9gk/dw036jX2AqCofFJmvaFCBJC1mnN23F2s=; h=Subject:From:To:Date:In-Reply-To:References; b=FKw8EIzYnYcNL1VYAentfEqNWZDzOl8sODCMvta50nlu8P5QJcTjg6OP8GZgXkqAU lQdRHL5hM2PSJpZ3q1vT/wEP2ejEtDyFNGrPpra57gYuZKRfEVO5U7jfzdP4SG9csq k59hSYXXnbS9a5LTjTO7ltUTROFVZJ4h31hUPlKvLLpgNOeV5d5iCWOiY1k9PbtPF0 HHVxPc5HYecrAnB5dmxOMDxyz06SDczWTU3WhTroW5JWFIlfsOM4SMrHrE0VsgoQ/n IdOSDuy3JPMLrNgKKJ2t6caYcGfIvUrwzlgqW9CA2vo6uJjZuGGGYA3hOSWxd6EPCW 9v6Kcyza4LZ1g== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Maxime Devos schreef op di 29-03-2022 om 22:30 [+0200]: > Maxime Devos schreef op ma 28-03-2022 om 15:12 [+0200]: > > Patch is not yet ready (I'm looking at the source code diff for > > anything ‘suspicious’), just reserving a bug number and avoiding > > double > > work.  Will send an actual patch later. > > Looks like it cannot find libssh2: With the attached patch, libgit2 actually finds libssh2. Next steps: * [ ] verify it builds on a 32-bit arch (maybe i686-linux) * [ ] verify it cross-compiles * [ ] verify that dependents still build. If someone has a x86_64 and is interested in a reproducibility check: # store item returned by "./pre-inst-env guix build libgit2 --no- grafts" $ ./pre-inst-env guix hash -r /gnu/store/5sm6dz6jjn7bgnqlakhlw72ncfxdyh2n-libgit2-1.4.2 1g3qbpca5j5s7iklx5ln6pi4aw0ycx69djiajgzqmw7k64b935qb Greetings, Maxime. From a7df2fe70f38cfb53084e1bea14e90836fa8caa5 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 31 Mar 2022 16:34:47 +0000 Subject: [PATCH] gnu: libgit2: Update to 1.4.2. * gnu/packages/version-control.scm (libgit2) [version]: Update to 1.4.2. [arguments]<#:configure-flags>: Explicitly enable SSH support. [arguments]<#:phases>{check}: Adjust to new test runner name. [arguments]<#:phases>{fix-hardcoded-paths}: Remove obsolete phase. --- gnu/packages/version-control.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9489cf9980..f48c5d2b53 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -789,7 +790,7 @@ to GitHub contributions calendar.") (define-public libgit2 (package (name "libgit2") - (version "1.3.0") + (version "1.4.2") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -800,7 +801,7 @@ to GitHub contributions calendar.") (file-name (git-file-name name version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")) + "0xd5w2kzdafipf10sdjmrzzsi12q8rkpcafajwlnmwvrbg6ldvs5")) (modules '((guix build utils))) (snippet '(delete-file-recursively "deps")))) (build-system cmake-build-system) @@ -810,6 +811,7 @@ to GitHub contributions calendar.") (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing ,@(if (%current-target-system) `((string-append "-DPKG_CONFIG_EXECUTABLE=" @@ -820,18 +822,11 @@ to GitHub contributions calendar.") '())) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "tests/repo/init.c" - (("#!/bin/sh") (string-append "#!" (which "sh")))) - (substitute* "tests/clar/fs.h" - (("/bin/cp") (which "cp")) - (("/bin/rm") (which "rm"))))) ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) (if tests? - (invoke "./libgit2_clar" "-v" "-Q") + (invoke "./libgit2_tests" "-v" "-Q") ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%"))))))) (inputs base-commit: 9a31942cabb5c73174aee96ecd873fcf89955a9d -- 2.30.2