[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65478] [PATCH emacs-team v3] build: emacs-utils: Adjust `emacs-comp
From: |
Liliana Marie Prikler |
Subject: |
[bug#65478] [PATCH emacs-team v3] build: emacs-utils: Adjust `emacs-compile-directory' for Emacs 29. |
Date: |
Fri, 01 Sep 2023 21:37:58 +0200 |
User-agent: |
Evolution 3.46.4 |
Am Samstag, dem 02.09.2023 um 00:15 +0800 schrieb Hilton Chain:
> * guix/build/emacs-utils.scm (emacs-compile-directory): After native
> compilation, write the bytecode file with `comp-write-bytecode-file'.
> ---
> guix/build/emacs-utils.scm | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
> index ac3dac57d1..8e12b5b6d4 100644
> --- a/guix/build/emacs-utils.scm
> +++ b/guix/build/emacs-utils.scm
> @@ -139,7 +139,7 @@ (define* (emacs-compile-directory dir)
> (files (directory-files-recursively ,dir "\\.el$")))
> (mapc
> (lambda (file)
> - (let (byte-to-native-output-file
> + (let (byte-to-native-output-buffer-file
> ;; First entry is the eln-cache of the homeless
> shelter,
> ;; second entry is the install directory.
> (eln-dir (and (native-comp-available-p)
> @@ -148,13 +148,9 @@ (define* (emacs-compile-directory dir)
> (native-compile file
> (comp-el-to-eln-filename file eln-
> dir))
> (byte-compile-file file))
> - ;; Sadly, we can't use pcase because quasiquote works
> different in
> - ;; Emacs. See `batch-byte+native-compile' in comp.el
> for the
> - ;; actual shape of byte-to-native-output-file.
> - (unless (null byte-to-native-output-file)
> - (rename-file (car byte-to-native-output-file)
> - (cdr byte-to-native-output-file)
> - t))))
> + ;; After native compilation, write the bytecode file.
> + (unless (null byte-to-native-output-buffer-file)
> + (comp-write-bytecode-file nil))))
> files))
> #:dynamic? #t))
LGTM, at least regarding emacs-flim-lb. I have it applied locally with
the fancy quotes made extra fancy; will wait for CI before pushing,
however.
Cheers