guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: emacs-realgud: Patch configure.ac to repair the build.


From: Maxim Cournoyer
Subject: 01/01: gnu: emacs-realgud: Patch configure.ac to repair the build.
Date: Thu, 15 Nov 2018 23:18:44 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 03592a6f882f5b4309f77c3dc3e65559d7b7cb75
Author: Maxim Cournoyer <address@hidden>
Date:   Wed Oct 31 00:24:04 2018 -0400

    gnu: emacs-realgud: Patch configure.ac to repair the build.
    
    This fixes https://bugs.gnu.org/33196, a build problem caused by a defective
    Elisp snippet in a check in configure.ac.
    
    * gnu/packages/patches/emacs-realgud-fix-configure-ac.patch: Add patch.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/emacs.scm (emacs-realgud)[source]: Use it.
---
 gnu/local.mk                                       |  2 ++
 gnu/packages/emacs.scm                             |  6 ++++-
 .../patches/emacs-realgud-fix-configure-ac.patch   | 27 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 23a6cb3..2a90a85 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -19,6 +19,7 @@
 # Copyright © 2018 Amirouche Boubekki <address@hidden>
 # Copyright © 2018 Oleg Pykhalov <address@hidden>
 # Copyright © 2018 Stefan Stefanović <address@hidden>
+# Copyright © 2018 Maxim Cournoyer <address@hidden>
 #
 # This file is part of GNU Guix.
 #
@@ -663,6 +664,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch   \
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
+  %D%/packages/patches/emacs-realgud-fix-configure-ac.patch    \
   %D%/packages/patches/enlightenment-fix-setuid-path.patch     \
   %D%/packages/patches/erlang-man-path.patch                   \
   %D%/packages/patches/eudev-rules-directory.patch             \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3e32998..ce1add3 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3659,7 +3659,11 @@ after buffer changes.")
                            version ".tar"))
        (sha256
         (base32
-         "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"))))
+         "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24"))
+       (patches
+        ;; Patch awaiting inclusion upstream (see:
+        ;; https://github.com/realgud/realgud/pull/226).
+        (search-patches "emacs-realgud-fix-configure-ac.patch"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
diff --git a/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch 
b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch
new file mode 100644
index 0000000..8165857
--- /dev/null
+++ b/gnu/packages/patches/emacs-realgud-fix-configure-ac.patch
@@ -0,0 +1,27 @@
+From a293690f29407ac54a218d6d20c2142e1a0319d1 Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <address@hidden>
+Date: Wed, 31 Oct 2018 00:08:34 -0400
+Subject: [PATCH] configure.ac: Fix NO_CHECK_EMACS_PACKAGES elisp.
+
+Remove the extraneous trailing parenthesis.
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index de0d932..69bcea7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,8 +25,7 @@ AC_MSG_NOTICE("Checking prerequiste packages")
+ $EMACS -batch -q --no-site-file -eval \
+   '(dolist (package
+          (quote (cl-lib loc-changes load-relative test-simple)))
+-        (require package))
+-   )'
++        (require package))'
+ fi
+ if test $? -ne 0 ; then
+     AC_MSG_ERROR([Can't continue until above error is corrected.])
+-- 
+2.19.0
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]