Message ID | 87y1hv6blh.wl-hako@ultrarare.space |
---|---|
State | New |
Headers | show |
Series | [bug#65478,emacs-team] gnu: emacs-flim-lb: Explicitly compile files to bytecode. | expand |
Am Montag, dem 28.08.2023 um 12:21 +0800 schrieb Hilton Chain: > And the following patch should work for Emacs 29, but not 28: > > --8<---------------cut here---------------start------------->8--- > diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm > index 850b1f5f2a..6c27b186e3 100644 > --- a/guix/build/emacs-utils.scm > +++ b/guix/build/emacs-utils.scm > @@ -138,7 +138,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,12 +148,12 @@ (define* (emacs-compile-directory dir) > (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)))) > + ;; Emacs. See `comp-write-bytecode-file' in comp.el for > the actual > + ;; shape of byte-to-native-output-buffer-file. We should probably mention that we don't have to hack the timestamp. Or maybe we can use comp-write-bytecode-file directly? > + (unless (null byte-to-native-output-buffer-file) > + (byte-write-target-file > + (car byte-to-native-output-buffer-file) > + (cdr byte-to-native-output-buffer-file))))) > files)) > #:dynamic? #t)) > --8<---------------cut here---------------end--------------->8--- Could you submit a properly cleaned version of this as v2 so that we can get CI to build it along with proper attribution? Cheers
diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 850b1f5f2a..6c27b186e3 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -138,7 +138,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,12 +148,12 @@ (define* (emacs-compile-directory dir) (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)))) + ;; Emacs. See `comp-write-bytecode-file' in comp.el for the actual + ;; shape of byte-to-native-output-buffer-file. + (unless (null byte-to-native-output-buffer-file) + (byte-write-target-file + (car byte-to-native-output-buffer-file) + (cdr byte-to-native-output-buffer-file))))) files)) #:dynamic? #t)) --8<---------------cut here---------------end--------------->8---