Subject: bug#46950: closed ([PATCH] gnu: vim-full: Remove duplicate 'make-flags'.)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 06 Mar 2021 00:31:02 +0000

Your bug report

#46950: [PATCH] gnu: vim-full: Remove duplicate 'make-flags'.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
46950: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=46950
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: [PATCH] gnu: vim-full: Remove duplicate 'make-flags'.
From: Tobias Geerinckx-Rice <[email-masked]>
To: [email-masked]
Date: Sat, 06 Mar 2021 01:30:21 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Pushed as c8cbd369eb512b0bc5cc0d5dfc2b5d35da50aa4f with minor ‘[’ 
tweak and removed out-of-place comment.

Thanks for the swift fix!

T G-R

Subject: [PATCH] gnu: vim-full: Remove duplicate 'make-flags'.
From: zimoun <[email-masked]>
To: [email-masked]
Cc: zimoun <[email-masked]>
Date: Fri, 5 Mar 2021 20:24:23 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Fixes <https://bugs.gnu.org/46580>.

* gnu/packages/vim.scm (vim-full): [arguments]: Remove duplicate 'make-flags'.
---
 gnu/packages/vim.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 372d470e09..2202788ee3 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2019 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2019, 2020 Jakub Kądziołka <[email-masked]>
 ;;; Copyright © 2020 Jack Hill <[email-masked]>
+;;; Copyright © 2021 Simon Tournier <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -216,11 +217,14 @@ with the editor vim.")))
              "--enable-xim"
              "--disable-selinux"
              "--enable-gui")
-       ;; This flag fixes the following error:
-       ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel'
-       ;; .../libexpat.so.1: error adding symbols: DSO missing from command line
-       #:make-flags '("LDFLAGS=-lexpat")
        ,@(substitute-keyword-arguments (package-arguments vim)
+           ;; This flag fixes the following error:
+           ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel'
+           ;; .../libexpat.so.1: error adding symbols: DSO missing from command line
+           ((#:make-flags flags)
+            `(append
+              (list "LDFLAGS=-lexpat")
+              (delete "CFLAGS=-D_REENTRANT" ,flags))) ; Fix <https://bugs.gnu.org/46580>.
            ((#:phases phases)
             `(modify-phases ,phases
                (add-before 'check 'start-xserver

base-commit: b2a94e59b8fba2f43fbefc45c2f1c4caeabdedb1
-- 
2.30.1