From patchwork Sat Sep 7 16:30:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Evgeny Pisemsky X-Patchwork-Id: 67723 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 0F87327BBEA; Sat, 7 Sep 2024 17:31:29 +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=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6946227BBE2 for ; Sat, 7 Sep 2024 17:31:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smyL1-0004cH-Ry; Sat, 07 Sep 2024 12:31:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smyKz-0004bt-P1 for guix-patches@gnu.org; Sat, 07 Sep 2024 12:31:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smyKz-0006Py-GO for guix-patches@gnu.org; Sat, 07 Sep 2024 12:31:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=5H9ooErvpSTQIUhLnCft617B9P+cv47Fn6rA2uR1KnA=; b=t5cpswPZNRV4618rVE4UqM8i3X1iX778gMQzSUNpXdGN3gUlKrytDJxualUQe60gq8rKHl4WE0QjrWaX+vCPiyztQipGaWCPaRMPMczUBpij51GJ7lWry5BLXLpmsjDsgMZrEVhGvQW2LfS79U4wtIjK1hVU/qn/7z/qgUMy6XNj6DKqpTwtdbJA3SweVgqKMkddSYrf9VIyien0Gu7vV9uaqzqX4gTwORBsm+JQX3afEJs3IEQ8nFmGDwT1wsOeIlnq9/5bzDfEAOwMHxhDJiohl7RFAImv9Bi8bwrybLSAXwVBiJCMpxlTdP94tRJ5V8pdgtD4AGhRQ8xp0iuLgA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smyL0-0006Si-5l for guix-patches@gnu.org; Sat, 07 Sep 2024 12:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72541] [PATCH] gnu: gerbv: Fix missing version. Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Sep 2024 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72541 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 72541@debbugs.gnu.org Received: via spool by 72541-submit@debbugs.gnu.org id=B72541.172572663724803 (code B ref 72541); Sat, 07 Sep 2024 16:31:02 +0000 Received: (at 72541) by debbugs.gnu.org; 7 Sep 2024 16:30:37 +0000 Received: from localhost ([127.0.0.1]:57333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smyKa-0006Rz-GM for submit@debbugs.gnu.org; Sat, 07 Sep 2024 12:30:37 -0400 Received: from roxy-shared.hosting.energy ([137.74.182.160]:46257 helo=roxy.hosting.energy) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smyKW-0006Rf-VO for 72541@debbugs.gnu.org; Sat, 07 Sep 2024 12:30:34 -0400 Received: from [185.211.158.4] (helo=laptop) by roxy.hosting.energy with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1smyKO-000000001U9-3pzZ; Sat, 07 Sep 2024 19:30:25 +0300 From: Evgeny Pisemsky In-Reply-To: <87frqcwiwg.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Fri, 06 Sep 2024 23:51:11 +0200") References: <87sevdoqh8.fsf@pisemsky.site> <87frqcwiwg.fsf@gnu.org> Date: Sat, 07 Sep 2024 19:30:23 +0300 Message-ID: <87plpfo28w.fsf@pisemsky.site> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: ClamAV 0.101.4; Sat, 07 Sep 2024 19:30:25 +0300 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello! The problem is certainly in this script or its environment, since the only place where version can come from is this line in configure.ac: AC_INIT([gerbv], [m4_esyscmd(utils/git-version-gen.sh 2.10.0)]) This gave me the idea to do substitution there to avoid running it. As for wrong flag, I suggest just removing it. Alter these changes gerbv builds and works fine for me. Updated patch attached. From 5bc5612026d51a2614b29668addf0f8de0aefe76 Mon Sep 17 00:00:00 2001 Message-ID: <5bc5612026d51a2614b29668addf0f8de0aefe76.1725723700.git.mail@pisemsky.site> From: Evgeny Pisemsky Date: Sat, 7 Sep 2024 18:40:06 +0300 Subject: [PATCH] gnu: gerbv: Fix missing version. * gnu/packages/engineering.scm (gerbv): Fix missing version. [source]: Change indentation. [arguments]: Remove wrong configure flags, avoid running git version generator. Change-Id: I29a38fff03127d9ce2b5e04ca638dacfc3720125 --- gnu/packages/engineering.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 26f47dbf9d..d2e524a7f8 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Foo Chuan Wei -;;; Copyright © 2022 Evgeny Pisemsky +;;; Copyright © 2022, 2024 Evgeny Pisemsky ;;; Copyright © 2022 Olivier Dion ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Malte Frank Gerdes @@ -837,18 +837,24 @@ (define-public gerbv (package (name "gerbv") (version "2.10.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gerbv/gerbv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gerbv/gerbv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("CFLAGS=-fcommon"))) + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'avoid-git-version-gen + (lambda _ + (substitute* "configure.ac" + (("utils/git-version-gen.sh") + "echo -n"))))))) (native-inputs (list autoconf automake desktop-file-utils base-commit: 18d02443e1ec37779ee3cf63f9aaff1746bfdd8e -- 2.45.2