* [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible.
2024-03-02 17:08 [bug#69510] [PATCH emacs-team 0/2] Update emacs-next Liliana Marie Prikler
@ 2024-03-02 15:56 ` Liliana Marie Prikler
2024-03-02 16:13 ` [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655 Liliana Marie Prikler
2024-03-04 14:45 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Andrew Tropin via Guix-patches via
0 siblings, 2 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-03-02 15:56 UTC (permalink / raw)
To: 69510; +Cc: Mekeor Melire, andrew, cox.katherine.e+guix, liliana.prikler
Newer (development) builds of Emacs 30 mark a number of functions related to
native compilation as ‘internal’. Since we rely on such functions and there
does not appear to be a high-level replacement at the moment, let's work
around this case.
* guix/build/emacs-utils.scm (emacs-compile-directory): Require comp early
and check if ‘comp-write-bytecode-file’ is available.
Fixes: Upstream renamed comp-write-bytecode-file <https://bugs.gnu.org/69201>
---
guix/build/emacs-utils.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
index eca42bf305..aeb364133a 100644
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@ -136,7 +136,14 @@ (define* (emacs-compile-directory dir)
(emacs-batch-eval
`(let ((byte-compile-debug t) ; for proper exit status
(byte+native-compile (native-comp-available-p))
- (files (directory-files-recursively ,dir "\\.el$")))
+ (files (directory-files-recursively ,dir "\\.el$"))
+ (write-bytecode
+ (and (native-comp-available-p)
+ (progn
+ (require 'comp)
+ (if (fboundp 'comp-write-bytecode-file)
+ 'comp-write-bytecode-file
+ 'comp--write-bytecode-file)))))
(mapc
(lambda (file)
(let (byte-to-native-output-buffer-file
@@ -152,7 +159,7 @@ (define* (emacs-compile-directory dir)
(byte-compile-file file))
;; After native compilation, write the bytecode file.
(unless (null byte-to-native-output-buffer-file)
- (comp-write-bytecode-file nil))))
+ (funcall write-bytecode nil))))
files))
#:dynamic? #t))
base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655.
2024-03-02 15:56 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Liliana Marie Prikler
@ 2024-03-02 16:13 ` Liliana Marie Prikler
2024-03-04 14:45 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Andrew Tropin via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-03-02 16:13 UTC (permalink / raw)
To: 69510; +Cc: Mekeor Melire, andrew, cox.katherine.e+guix, liliana.prikler
* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-2.170c655.
* gnu/packages/aux-files/emacs/comp-integrity.el: Adjust accordingly.
---
gnu/packages/aux-files/emacs/comp-integrity.el | 5 ++++-
gnu/packages/emacs.scm | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el
index ed6a348fed..9692d9bf97 100644
--- a/gnu/packages/aux-files/emacs/comp-integrity.el
+++ b/gnu/packages/aux-files/emacs/comp-integrity.el
@@ -89,7 +89,10 @@
(expect-native mouse-wheel-change-button)
(expect-native advice-function-mapc)
(expect-native comment-string-strip)
-(expect-native obarray-make)
+(if (>= emacs-major-version 30)
+ (expect-builtin obarray-make)
+ (expect-native obarray-make))
+(expect-native obarray-map)
(expect-native oclosure-type)
(expect-native forward-page)
(expect-native sentence-end)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e6f2b699ac..e89c6cff16 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -549,8 +549,8 @@ (define-public emacs-wide-int
#~(cons "--with-wide-int" #$flags))))))
(define-public emacs-next-minimal
- (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
- (revision "1"))
+ (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42")
+ (revision "2"))
(package
(inherit emacs-minimal)
(name "emacs-next-minimal")
@@ -563,7 +563,7 @@ (define-public emacs-next-minimal
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))
+ (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk"))
(patches
(search-patches "emacs-next-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#69510] [PATCH emacs-team 0/2] Update emacs-next
@ 2024-03-02 17:08 Liliana Marie Prikler
2024-03-02 15:56 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Liliana Marie Prikler
0 siblings, 1 reply; 4+ messages in thread
From: Liliana Marie Prikler @ 2024-03-02 17:08 UTC (permalink / raw)
To: 69510; +Cc: andrew, cox.katherine.e+guix, liliana.prikler
Liliana Marie Prikler (2):
guix: emacs-utils: Make emacs-compile-directory forwards-compatible.
gnu: emacs-next-minimal: Update to 30.0.50-2.170c655.
gnu/packages/aux-files/emacs/comp-integrity.el | 5 ++++-
gnu/packages/emacs.scm | 6 +++---
guix/build/emacs-utils.scm | 11 +++++++++--
3 files changed, 16 insertions(+), 6 deletions(-)
base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
--
2.41.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible.
2024-03-02 15:56 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Liliana Marie Prikler
2024-03-02 16:13 ` [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655 Liliana Marie Prikler
@ 2024-03-04 14:45 ` Andrew Tropin via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Tropin via Guix-patches via @ 2024-03-04 14:45 UTC (permalink / raw)
To: Liliana Marie Prikler, 69510
Cc: Mekeor Melire, cox.katherine.e+guix, liliana.prikler
[-- Attachment #1: Type: text/plain, Size: 2133 bytes --]
On 2024-03-02 16:56, Liliana Marie Prikler wrote:
> Newer (development) builds of Emacs 30 mark a number of functions related to
> native compilation as ‘internal’. Since we rely on such functions and there
> does not appear to be a high-level replacement at the moment, let's work
> around this case.
>
> * guix/build/emacs-utils.scm (emacs-compile-directory): Require comp early
> and check if ‘comp-write-bytecode-file’ is available.
>
> Fixes: Upstream renamed comp-write-bytecode-file <https://bugs.gnu.org/69201>
> ---
> guix/build/emacs-utils.scm | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
> index eca42bf305..aeb364133a 100644
> --- a/guix/build/emacs-utils.scm
> +++ b/guix/build/emacs-utils.scm
> @@ -136,7 +136,14 @@ (define* (emacs-compile-directory dir)
> (emacs-batch-eval
> `(let ((byte-compile-debug t) ; for proper exit status
> (byte+native-compile (native-comp-available-p))
> - (files (directory-files-recursively ,dir "\\.el$")))
> + (files (directory-files-recursively ,dir "\\.el$"))
> + (write-bytecode
> + (and (native-comp-available-p)
> + (progn
> + (require 'comp)
> + (if (fboundp 'comp-write-bytecode-file)
> + 'comp-write-bytecode-file
> + 'comp--write-bytecode-file)))))
> (mapc
> (lambda (file)
> (let (byte-to-native-output-buffer-file
> @@ -152,7 +159,7 @@ (define* (emacs-compile-directory dir)
> (byte-compile-file file))
> ;; After native compilation, write the bytecode file.
> (unless (null byte-to-native-output-buffer-file)
> - (comp-write-bytecode-file nil))))
> + (funcall write-bytecode nil))))
> files))
> #:dynamic? #t))
>
>
> base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d
Hi Liliana!
Looks reasonable to me.
--
Best regards,
Andrew Tropin
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-04 14:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-02 17:08 [bug#69510] [PATCH emacs-team 0/2] Update emacs-next Liliana Marie Prikler
2024-03-02 15:56 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Liliana Marie Prikler
2024-03-02 16:13 ` [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655 Liliana Marie Prikler
2024-03-04 14:45 ` [bug#69510] [PATCH emacs-team 1/2] guix: emacs-utils: Make emacs-compile-directory forwards-compatible Andrew Tropin via Guix-patches via
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).