janneke pushed a commit to branch core-packages-team-old
in repository guix.

commit 923a05c55dd0bf59edf538faaeeefce16df4d371
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Wed Jan 1 11:46:51 2025 +0100

    gnu: nvi: Fix build with gcc-14.
    
    * gnu/packages/nvi.scm (nvi)[arguments]: Add CFLAGS to #:make-flags to relax
    gcc-14's strictness.
    
    Change-Id: I8572a13360c1571c5afe29789061d6277d1fb977
---
 gnu/packages/nvi.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm
index 68a118dcef..0fc860b482 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 <[email protected]>
 ;;; Copyright © 2020 Marius Bakke <[email protected]>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -71,8 +72,13 @@
           ,@(if (%current-target-system)
                 '("vi_cv_sprintf_count=yes")
                 '()))
-        #:make-flags (list "CFLAGS=-g -O2 -Wno-incompatible-pointer-types\
- -Wno-implicit-function-declaration")
+        #:make-flags
+        (list
+         ;; nvi's configure chokes on passing CFLAGS and ignores
+         ;; CFLAGS set in the environment
+         (string-append "CFLAGS=-g -O2"
+                        " -Wno-error=implicit-function-declaration"
+                        " -Wno-error=incompatible-pointer-types"))
         #:phases
         (modify-phases %standard-phases
           (add-before 'configure 'fix-configure
@@ -89,8 +95,7 @@
                               ,(version-major+minor
                                 (package-version automake))
                               "/" file) "."))
-                          '("config.sub")))
-              #t)))))
+                          '("config.sub"))))))))
     (inputs
       (list bdb ncurses))
     (native-inputs

Reply via email to