From: Andrew Tropin <andrew@trop.in>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>, 66225@debbugs.gnu.org
Cc: 66227@debbugs.gnu.org, Nicolas Graves <ngraves@ngraves.fr>,
cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com,
Ricardo Wurmus <rekado@elephly.net>,
Akib Azmain Turja <akib@disroot.org>
Subject: [bug#66225] [PATCH v3] gnu: emacs-next-minimal: Apply Guix patches.
Date: Sat, 07 Oct 2023 09:56:49 +0400 [thread overview]
Message-ID: <87r0m7ug9q.fsf@trop.in> (raw)
In-Reply-To: <f1b08fdebcfbb9b7dc513118a1994148ac38042e.1696608253.git.liliana.prikler@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 5453 bytes --]
On 2023-10-06 17:58, Liliana Marie Prikler wrote:
> * gnu/packages/patches/emacs-next-native-comp-driver-options.patch: Add file.
> * gnu/packages/patches/emacs-next-exec-path.patch: Add file.
> * gnu/local.mk (dist_patch_DATA): Register them here.
> * gnu/packages/emacs.scm (emacs-next-minimal)[origin](patches): Include the
> same patches as emacs-minimal, save for the variants specific to emacs-next
> introduced above.
>
> Co-Authored-By: Nicolas Graves <ngraves@ngraves.fr>
> Fixes: ‘emacs-next’ is almost unusable <https://bugs.gnu.org/66227>
> ---
> Hi Guix,
>
> this bug was independently discovered in two locations, so I wanted to
> inform both. A fix has already been proposed, but is not yet complete.
> Here's to finally cover everything we need to have an Emacs as expected
> by Guix.
>
> Feel free to bikeshed.
>
> Happy hacking
>
> gnu/local.mk | 2 ++
> gnu/packages/emacs.scm | 7 ++++++-
> .../patches/emacs-next-exec-path.patch | 18 ++++++++++++++++++
> ...emacs-next-native-comp-driver-options.patch | 18 ++++++++++++++++++
> 4 files changed, 44 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/emacs-next-exec-path.patch
> create mode 100644 gnu/packages/patches/emacs-next-native-comp-driver-options.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 65d50abc71..43a528e937 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1110,6 +1110,8 @@ dist_patch_DATA = \
> %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
> %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
> %D%/packages/patches/emacs-native-comp-driver-options.patch \
> + %D%/packages/patches/emacs-next-exec-path.patch \
> + %D%/packages/patches/emacs-next-native-comp-driver-options.patch \
> %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \
> %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \
> %D%/packages/patches/emacs-telega-path-placeholder.patch \
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 72b2c7795e..b9d9e2b891 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -498,7 +498,12 @@ (define-public emacs-next-minimal
> (commit commit)))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")))))))
> + (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))
> + (patches
> + (search-patches "emacs-next-exec-path.patch"
> + "emacs-fix-scheme-indent-function.patch"
> + "emacs-next-native-comp-driver-options.patch"
> + "emacs-pgtk-super-key-fix.patch")))))))
>
> (define* (emacs->emacs-next emacs #:optional name
> #:key (version (package-version emacs-next-minimal))
> diff --git a/gnu/packages/patches/emacs-next-exec-path.patch b/gnu/packages/patches/emacs-next-exec-path.patch
> new file mode 100644
> index 0000000000..6e33e25258
> --- /dev/null
> +++ b/gnu/packages/patches/emacs-next-exec-path.patch
> @@ -0,0 +1,18 @@
> +Do not capture the build-time value of $PATH in the 'emacs' executable
> +since this can noticeably increase the size of the closure of Emacs
> +with things like GCC being referenced.
> +
> +Index: emacs-next/lisp/loadup.el
> +===================================================================
> +--- emacs-next.orig/lisp/loadup.el
> ++++ emacs-next/lisp/loadup.el
> +@@ -599,7 +599,8 @@ lost after dumping")))
> + ((equal dump-mode "dump") "emacs")
> + ((equal dump-mode "bootstrap") "emacs")
> + ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp")
> +- (t (error "Unrecognized dump mode %s" dump-mode)))))
> ++ (t (error "Unrecognized dump mode %s" dump-mode))))
> ++ (exec-path nil))
> + (when (and (featurep 'native-compile)
> + (equal dump-mode "pdump"))
> + ;; Don't enable this before bootstrap is completed, as the
> diff --git a/gnu/packages/patches/emacs-next-native-comp-driver-options.patch b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch
> new file mode 100644
> index 0000000000..e4ed5a48f1
> --- /dev/null
> +++ b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch
> @@ -0,0 +1,18 @@
> +We substitute this anyway, so let's make it easier to substitute.
> +
> +--- a/lisp/emacs-lisp/comp.el
> ++++ b/lisp/emacs-lisp/comp.el
> +@@ -203,9 +203,7 @@ and above."
> + :type '(repeat string)
> + :version "28.1")
> +
> +-(defcustom native-comp-driver-options
> +- (cond ((eq system-type 'darwin) '("-Wl,-w"))
> +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
> ++(defcustom native-comp-driver-options nil
> + "Options passed verbatim to the native compiler's back-end driver.
> + Note that not all options are meaningful; typically only the options
> + affecting the assembler and linker are likely to be useful.
> +--
> +2.38.0
> +
>
> base-commit: e863274e67e2242b970845783172c9f4e49405ca
Hi Liliana and Nicolas, the fixes looks good to me.
--
Best regards,
Andrew Tropin
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2023-10-07 6:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 1:37 [bug#66225] [PATCH] gnu: emacs: Fix emacs native compilation on most recent emacsen Nicolas Graves via Guix-patches via
2023-10-01 20:06 ` [bug#66225] [PATCH v2 1/2] patch: emacs-native-comp-driver-options: Rename patch Nicolas Graves via Guix-patches via
2023-10-01 20:06 ` [bug#66225] [PATCH v2 2/2] gnu: emacs-next-minimal: Add patch emacs-native-comp-driver-options Nicolas Graves via Guix-patches via
2023-10-02 17:06 ` Liliana Marie Prikler
2023-10-02 19:30 ` Nicolas Graves via Guix-patches via
[not found] ` <f1b08fdebcfbb9b7dc513118a1994148ac38042e.1696608253.git.liliana.prikler@gmail.com>
2023-10-07 5:56 ` Andrew Tropin [this message]
2023-10-08 6:55 ` bug#66225: [PATCH v3] gnu: emacs-next-minimal: Apply Guix patches Liliana Marie Prikler
2023-10-08 10:21 ` [bug#66225] " Andrew Tropin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0m7ug9q.fsf@trop.in \
--to=andrew@trop.in \
--cc=66225@debbugs.gnu.org \
--cc=66227@debbugs.gnu.org \
--cc=akib@disroot.org \
--cc=cox.katherine.e+guix@gmail.com \
--cc=liliana.prikler@gmail.com \
--cc=ngraves@ngraves.fr \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).