From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QPq/I6KFQmCITwAA0tVLHw (envelope-from ) for ; Fri, 05 Mar 2021 19:25:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gB2EH6KFQmAKEQAAB5/wlQ (envelope-from ) for ; Fri, 05 Mar 2021 19:25:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9CA721FB6D for ; Fri, 5 Mar 2021 20:25:21 +0100 (CET) Received: from localhost ([::1]:35428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIG4e-0000Qh-MB for larch@yhetil.org; Fri, 05 Mar 2021 14:25:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIG4M-0000QX-Ll for guix-patches@gnu.org; Fri, 05 Mar 2021 14:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIG4M-0003Ni-Ei for guix-patches@gnu.org; Fri, 05 Mar 2021 14:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lIG4M-00020O-BC for guix-patches@gnu.org; Fri, 05 Mar 2021 14:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46950] [PATCH] gnu: vim-full: Remove duplicate 'make-flags'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Mar 2021 19:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46950 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46950@debbugs.gnu.org Cc: zimoun X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16149722867679 (code B ref -1); Fri, 05 Mar 2021 19:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2021 19:24:46 +0000 Received: from localhost ([127.0.0.1]:35471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIG46-0001zn-1H for submit@debbugs.gnu.org; Fri, 05 Mar 2021 14:24:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:37040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIG44-0001zf-Ho for submit@debbugs.gnu.org; Fri, 05 Mar 2021 14:24:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIG44-0000Pr-BU for guix-patches@gnu.org; Fri, 05 Mar 2021 14:24:44 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIG42-0003Ie-Nc for guix-patches@gnu.org; Fri, 05 Mar 2021 14:24:44 -0500 Received: by mail-wr1-x435.google.com with SMTP id u14so3302044wri.3 for ; Fri, 05 Mar 2021 11:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5ADkIMPcrfbf0NjPZgLXakEltuwMR5fc+zNRCZ/7gGs=; b=t/Hq6uoVn3Ooa4if0vh14xzRxmbWQhWFlfik/tUNnnjzL8QI81/aVQiEykaJSdGuAC J51IelprAJh+BUvb2s1cWhsJmocFGcdBUAWht1YawGmuadzKDHifX769k7+4zT8QCn7A sAhZ+xDFAe0cIvItpeqMnBzX/s2H8brQv2JbBa9j9SuWIxkkJpglMf5FYxjyFOpeNF9K LBlYw4HN5Au9T7uySER6R+w8+B/9ELfzqeoUdkfBB8II5wHFwg+F4alMxEGF/6ettVDl 920fOnWuo8DKCjqSOfCKjQm7kt8bSP7MUsL5HL9lVq2PUD+eEvMTKSiNqrMgm9HI4aOR 2wuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5ADkIMPcrfbf0NjPZgLXakEltuwMR5fc+zNRCZ/7gGs=; b=IvBk2LFimLrBvM1k9/MtfGiBMbnDKbZsICz8cc8bWvipENAhCHuzmpwrUN6mefnYkJ 2/Aj8mSagdpH06DpdfmBGz+Vhmygda52riES6SyVQi60gARi9lL8yYEpEquDV1/V/vUg ZSVj9RYcjBa0ay8c9ObF1SeFzBNCzDEs32oyOrSGmvdTx5WLoSbxn1NM8S4+Pp0K5hPB PXS/juer7PpsVlazbqXmDVSPwbjXK0doJ/3C6z2rqswobBNzKxl0Mi6/Y+ELi8r5ljkS IRRb3dH2aO3AVAT22uQeeQAqWlB+8fZd/DUxSYSOAXPAk9Pq/ZeMI3gEeaYxNZuWwmmg JEtw== X-Gm-Message-State: AOAM53048KPmQ+oEIVoKoQ8o7X4f0k0vXFtpYF39Q25qr3LdWKQbl4Pv 80n600i79c7BGlWyc9qxTE02CoGeUbE= X-Google-Smtp-Source: ABdhPJwSzbFf6EuGut17LewslNNkcJ8uZjPDfr/X+xUawa/VSVKvEzS0vX/sxELxS6bmvCGHfgmXJg== X-Received: by 2002:adf:ea0e:: with SMTP id q14mr11080275wrm.389.1614972281066; Fri, 05 Mar 2021 11:24:41 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id x11sm5943693wme.9.2021.03.05.11.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 11:24:40 -0800 (PST) From: zimoun Date: Fri, 5 Mar 2021 20:24:23 +0100 Message-Id: <20210305192423.50766-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="t/Hq6uoV"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9CA721FB6D X-Spam-Score: -1.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: +tWiA/HIb4hI Fixes . * 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 ;;; Copyright © 2019, 2020 Jakub Kądziołka ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2021 Simon Tournier ;;; ;;; 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 . ((#:phases phases) `(modify-phases ,phases (add-before 'check 'start-xserver base-commit: b2a94e59b8fba2f43fbefc45c2f1c4caeabdedb1 -- 2.30.1