Hello!
Maxim Cournoyer <[email protected]> writes:
[...]
> The bug is triggered by this check in configure.ac:
>
> if test "$NO_CHECK_EMACS_PACKAGES" = "" ; then
> 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))
> )'
> fi
> if test $? -ne 0 ; then
> AC_MSG_ERROR([Can't continue until above error is corrected.])
> fi
>
>
> More specifically, running this with emacs:
>
> emacs -batch -q --no-site-file -eval '(dolist (package
>> (quote (cl-lib loc-changes load-relative test-simple)))
>> (require package))
>> )'
> Trailing garbage following expression:
> )
>
> Reproduces it.
I believe the attached patch fixes it. Feedback welcome!
Maxim
>From 4a50c2e81c41ada7ff2e43d70bc973de133da8fd Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <[email protected]>
Date: Wed, 31 Oct 2018 00:24:04 -0400
Subject: [PATCH] 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 ++++-
.../emacs-realgud-fix-configure-ac.patch | 27 +++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/emacs-realgud-fix-configure-ac.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6075e4795..61c4a9a39 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -19,6 +19,7 @@
# Copyright © 2018 Amirouche Boubekki <[email protected]>
# Copyright © 2018 Oleg Pykhalov <[email protected]>
# Copyright © 2018 Stefan Stefanović <[email protected]>
+# Copyright © 2018 Maxim Cournoyer <[email protected]>
#
# 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 45e92ee47..75b0a71ed 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3658,7 +3658,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 000000000..8165857c8
--- /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 <[email protected]>
+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
+
--
2.19.0
