GNU bug report logs - #74838
[PATCH 1/2] gnu: nvi: Refactor.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74838 in the body.
You can then email your comments to 74838 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: guix-patches <at> gnu.org
Subject: [PATCH 1/2] gnu: nvi: Refactor.
Date: Thu, 12 Dec 2024 21:27:07 +0100

* 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 <at> gmail.com>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2024 Herman Rimm <herman <at> rimm.ee>
 ;;;
 ;;; 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

Message #8 received at 74838 <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: 74838 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: nvi: Fix cross-compilation.
Date: Thu, 12 Dec 2024 21:31:09 +0100

* 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

Message #13 received at 74838-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Herman Rimm <herman <at> rimm.ee>
Cc: 74838-done <at> debbugs.gnu.org
Subject: Re: [bug#74838] [PATCH 1/2] gnu: nvi: Refactor.
Date: Fri, 21 Mar 2025 13:44:00 +0100

Herman Rimm <herman <at> rimm.ee> skribis:

> * gnu/packages/nvi.scm (nvi)[arguments]: Use G-exps.  Replace
> config.guess.
>
> Change-Id: I03b0c334426c637ba3e55910de02d8f4b15616fb

Finally rebased and applied.  I dropped the second patch, which is
redundant with 9fc3233d60af0cc4f30b0d8306da9ef16301aff7.

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.