GNU bug report logs - #62314
[PATCH] gnu: emacs-buttercup: Fix build with native compilation.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62314 in the body.
You can then email your comments to 62314 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Guix-patches <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: emacs-buttercup: Fix build with native compilation.
Date: Tue, 21 Mar 2023 02:26:44 +0000

[Message part 1 (text/plain, inline)]

Hi Guix,

Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix build emacs-buttercup --with-input=emacs-minimal=emacs.

Here is the link to the upstream issue: <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>

In short, it should be fixed but the fix used a variable name in current git Emacs which is different in the current release. So this patch adds the older variable name with the same fix.

I checked that it lints and native-comp and regular both build. I'll wait for QA to check for any other breakages. And I welcome any input on the commit message/code comment here.

Thanks!
John

[0001-gnu-emacs-buttercup-Fix-build-with-native-compilatio.patch (text/x-patch, attachment)]

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: John Kehayias via Guix-patches via <guix-patches <at> gnu.org>
Cc: John Kehayias <john.kehayias <at> protonmail.com>, 62314 <at> debbugs.gnu.org
Subject: Re: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native
 compilation.
Date: Tue, 21 Mar 2023 10:34:47 +0100

Hello,

John Kehayias via Guix-patches via <guix-patches <at> gnu.org> writes:

> Subject: [PATCH] gnu: emacs-buttercup: Fix build with native
> compilation.

Thank you.

> +          (add-after 'unpack 'fix-spy-on-test
> +            (lambda _
> +              (substitute* "buttercup.el"
> +                ;; The spy-on test fails with native compilation, which was
> +                ;; fixed in v1.30 but with a variable name for Emacs newer
> +                ;; than 28.2.  Add in the same fix with the current variable
> +                ;; name.  Upstream bug and fix:
> +                ;; <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>
> +                (("61880") "61880\n(comp-enable-subr-trampolines nil)\n"))))

Nitpick: I'm surprised by the choice of your anchor: 61880 is at the end
of a comment. Wouldn't

    (("\\(native-comp-enable-subr-trampolines nil\\)" all)
     (string-append all "\n(comp-enable-subr-trampolines nil)"))

be more explicit?

Regards,
-- 
Nicolas Goaziou

Message #16 received at 62314-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: 62314-done <at> debbugs.gnu.org
Subject: Re: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native
 compilation.
Date: Fri, 24 Mar 2023 10:17:26 +0100

Hello,

John Kehayias via Guix-patches via <guix-patches <at> gnu.org> writes:

> Here's a patch to fix emacs-buttercup failing with native-comp, i.e. guix build emacs-buttercup --with-input=emacs-minimal=emacs.

Applied, with my suggested change. Thanks.

Regards,
-- 
Nicolas Goaziou

Message #19 received at 62314 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 62314 <at> debbugs.gnu.org,
 John Kehayias via Guix-patches via <guix-patches <at> gnu.org>
Subject: Re: [bug#62314] [PATCH] gnu: emacs-buttercup: Fix build with native
 compilation.
Date: Fri, 24 Mar 2023 19:38:41 +0000

Hi,

On Tue, Mar 21, 2023 at 10:34 AM, Nicolas Goaziou wrote:

> Hello,
>
> John Kehayias via Guix-patches via <guix-patches <at> gnu.org> writes:
>
>> Subject: [PATCH] gnu: emacs-buttercup: Fix build with native
>> compilation.
>
> Thank you.
>
>> +          (add-after 'unpack 'fix-spy-on-test
>> +            (lambda _
>> +              (substitute* "buttercup.el"
>> +                ;; The spy-on test fails with native compilation, which was
>> +                ;; fixed in v1.30 but with a variable name for Emacs newer
>> +                ;; than 28.2.  Add in the same fix with the current variable
>> +                ;; name.  Upstream bug and fix:
>> +                ;; <https://github.com/jorgenschaefer/emacs-buttercup/issues/236>
>> +                (("61880") "61880\n(comp-enable-subr-trampolines nil)\n"))))
>
> Nitpick: I'm surprised by the choice of your anchor: 61880 is at the end
> of a comment. Wouldn't
>
>     (("\\(native-comp-enable-subr-trampolines nil\\)" all)
>      (string-append all "\n(comp-enable-subr-trampolines nil)"))
>
> be more explicit?

TIL what the second part of the first form for substitute is...thanks for that! Yes, that is better and something I will use in the future. Thanks also for pushing!

John

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.