From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: bug#33196: [PATCH] Re: bug#33196: emacs-realgud build failure Date: Wed, 31 Oct 2018 00:58:48 -0400 Message-ID: <877ehy7lvb.fsf_-_@apteryx.i-did-not-set--mail-host-address--so-tickle-me> References: <87d0rszgud.fsf@posteo.net> <87tvl3txtk.fsf@gmail.com> <87muquu6a8.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHibz-0002Ce-Et for bug-guix@gnu.org; Wed, 31 Oct 2018 01:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHibs-0002MF-RT for bug-guix@gnu.org; Wed, 31 Oct 2018 01:00:10 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHibr-0002L8-Aa for bug-guix@gnu.org; Wed, 31 Oct 2018 01:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHibr-0004sT-7Z for bug-guix@gnu.org; Wed, 31 Oct 2018 01:00:03 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87muquu6a8.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 30 Oct 2018 23:46:55 -0400") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Maxim Cournoyer Cc: 31891@debbugs.gnu.org, 33196@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello! Maxim Cournoyer 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 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-emacs-realgud-Patch-configure.ac-to-repair-the-b.patch Content-Transfer-Encoding: quoted-printable >From 4a50c2e81c41ada7ff2e43d70bc973de133da8fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer 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.pat= ch 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 =C2=A9 2018 Amirouche Boubekki # Copyright =C2=A9 2018 Oleg Pykhalov # Copyright =C2=A9 2018 Stefan Stefanovi=C4=87 +# Copyright =C2=A9 2018 Maxim Cournoyer # # This file is part of GNU Guix. # @@ -663,6 +664,7 @@ dist_patch_DATA =3D \ %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/gn= u/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 +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.]) +--=20 +2.19.0 + --=20 2.19.0 --=-=-=--