X-Loop: help-debbugs@HIDDEN Subject: [bug#74838] [PATCH 1/2] gnu: nvi: Refactor. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 12 Dec 2024 20:29:02 +0000 Resent-Message-ID: <handler.74838.B.173403530228000 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 74838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74838 <at> debbugs.gnu.org X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.173403530228000 (code B ref -1); Thu, 12 Dec 2024 20:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2024 20:28:22 +0000 Received: from localhost ([127.0.0.1]:40495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tLpnD-0007HR-4K for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 15:28:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:52488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tLpnA-0007HH-5u for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 15:28:13 -0500 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 <herman@HIDDEN>) id 1tLpn9-0003u7-CU for guix-patches@HIDDEN; Thu, 12 Dec 2024 15:28:11 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tLpn1-0004IL-Pn for guix-patches@HIDDEN; Thu, 12 Dec 2024 15:28:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734035269; 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=UvtG9n+S862X4Z+eMYQz3NrD10yuip6im4FYXNYiZJE=; b=pxwnRIsGm5HtuTZAIuvxBROWF8yIPLAHeDsNknEhkgwSMebaBfP2KfaPDMV+nzabWYShe+ blDSyiqmGS6D1YnPuvXFEDBt74NEJvl8wrb3+lEdJoVXbAgQY7FfEczrOwqPe4mOQvZ6YZ Fvj5oh0kn33rQ3YTqAQRNHkiokegKwhv31L9wBPN3ewqEACfVCi9+NVVuwNTIOHw1eZCdC clD5bpCgfmbwkJ6xFdKz0P6fIUIEGz3veyJHaR+aiJZp3xYiUgzy2IAjNudqw+UTMkRJQg R+udLy8G4KINzamrSVA54O1qHXk3Pxq0iDXZ42eHIa+vEByqByyw6pcqYUnzXw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 48f730d3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <guix-patches@HIDDEN>; Thu, 12 Dec 2024 20:27:49 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Thu, 12 Dec 2024 21:27:07 +0100 Message-ID: <5f4667ec07e73b337d6fae74d22ebf2e8097fd7c.1734035192.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, TVD_RCVD_IP=0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * gnu/packages/nvi.scm (nvi)[arguments]: Use G-exps. Replace config.guess. Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb --- gnu/packages/nvi.scm | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm index f1f461f2b4..bb23aa790a 100644 --- a/gnu/packages/nvi.scm +++ b/gnu/packages/nvi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc <merkur32@HIDDEN> ;;; Copyright © 2020 Marius Bakke <mbakke@HIDDEN> +;;; Copyright © 2024 Herman Rimm <herman@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages nvi) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix utils)) @@ -65,30 +67,32 @@ (define-public nvi (build-system gnu-build-system) (arguments - `(#:out-of-source? #t - #:configure-flags - '("--enable-widechar" - ,@(if (%current-target-system) - '("vi_cv_sprintf_count=yes") - '())) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.sub and config.guess: - (with-directory-excursion "dist" - (for-each (lambda (file) - (chmod file #o755) - (install-file - (string-append - (assoc-ref - (or native-inputs inputs) "automake") - "/share/automake-" - ,(version-major+minor - (package-version automake)) - "/" file) ".")) - '("config.sub"))) - #t))))) + (list + #:out-of-source? #t + #:configure-flags + #~'("--enable-widechar" + #$@(if (%current-target-system) + '("vi_cv_sprintf_count=yes") + '())) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "dist" + (for-each + (lambda (file) + (chmod file #o755) + (install-file + (format #f "~a/share/automake-~a/~a" + (assoc-ref (or native-inputs inputs) + "automake") + #$(version-major+minor + (package-version automake)) + file) + ".")) + '("config.sub" "config.guess"))) + #t))))) (inputs (list bdb ncurses)) (native-inputs base-commit: a9003b8e6b40b59c9545ae87bb441d3549630db7 -- 2.45.2
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Herman Rimm <herman@HIDDEN> Subject: bug#74838: Acknowledgement ([PATCH 1/2] gnu: nvi: Refactor.) Message-ID: <handler.74838.B.173403530228000.ack <at> debbugs.gnu.org> References: <5f4667ec07e73b337d6fae74d22ebf2e8097fd7c.1734035192.git.herman@HIDDEN> X-Gnu-PR-Message: ack 74838 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74838 <at> debbugs.gnu.org Date: Thu, 12 Dec 2024 20:29:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 74838 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 74838: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74838 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#74838] [PATCH 2/2] gnu: nvi: Fix cross-compilation. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 12 Dec 2024 20:32:01 +0000 Resent-Message-ID: <handler.74838.B74838.173403552028982 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 74838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74838 <at> debbugs.gnu.org Received: via spool by 74838-submit <at> debbugs.gnu.org id=B74838.173403552028982 (code B ref 74838); Thu, 12 Dec 2024 20:32:01 +0000 Received: (at 74838) by debbugs.gnu.org; 12 Dec 2024 20:32:00 +0000 Received: from localhost ([127.0.0.1]:40523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tLpqq-0007XO-AJ for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 15:32:00 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:51529 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tLpqn-0007X3-T9 for 74838 <at> debbugs.gnu.org; Thu, 12 Dec 2024 15:31:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734035511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OaXQFlusdHYo9rKq1/EkKvBEuJWSfmowSxgzms3rITw=; b=CgOgTa0UOYHrxyRNytxsj0fObRlv8iWD73Ao75GscR8S/yoFJA/7mMvARFeixBtt1jCtgT PzwIfpLejQ1QDsINAXxcgkh1c//jtLF0/M1RXvdKbvaWi/96pSmY8Xa3zfd8vGEOmoIm6W uh2aS5e/psdVyDI95GbE2gLlyVzyYsn8RaUVnG74ocXK1zKch7XGObgBVWYXId1c+LEYT1 1Lr74utrvkqjczLL3pc3dlExdYM5SQhVtY9gy/vTQMw86eKbgnC3n2o1baUyILO8vc8O8A jL90VvUFnHhmE7ncmCZwuINBzg8MBPzaDFh34YUKmYwUycesu01JWmJdesmmbw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 108a50f2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74838 <at> debbugs.gnu.org>; Thu, 12 Dec 2024 20:31:51 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Thu, 12 Dec 2024 21:31:09 +0100 Message-ID: <b0a5a321dc1b992db9afe024548c6f5fc2cb34b8.1734035192.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <5f4667ec07e73b337d6fae74d22ebf2e8097fd7c.1734035192.git.herman@HIDDEN> References: <5f4667ec07e73b337d6fae74d22ebf2e8097fd7c.1734035192.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/nvi.scm (nvi)[arguments]: Disable incompatible-pointer-type and implicit-function-declaration errors. Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb --- gnu/packages/nvi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 TVD_RCVD_IP Message was received from an IP address 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/nvi.scm (nvi)[arguments]: Disable incompatible-pointer-type and implicit-function-declaration errors. Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb --- gnu/packages/nvi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in sa-accredit.habeas.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [81.205.150.117 listed in zen.spamhaus.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [81.205.150.117 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/nvi.scm (nvi)[arguments]: Disable incompatible-pointer-type and implicit-function-declaration errors. Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb --- gnu/packages/nvi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm index bb23aa790a..ce65bcd916 100644 --- a/gnu/packages/nvi.scm +++ b/gnu/packages/nvi.scm @@ -92,7 +92,13 @@ (define-public nvi file) ".")) '("config.sub" "config.guess"))) - #t))))) + #t)) + (add-before 'configure 'fix-build + (let ((flags '("-g" "-O2" "-Wno-incompatible-pointer-types" + "-Wno-implicit-function-declaration"))) + (lambda _ + (when #$(or (target-hurd64?) (%current-target-system)) + (setenv "CPPFLAGS" (string-join flags))))))))) (inputs (list bdb ncurses)) (native-inputs -- 2.45.2
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.