[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57086] [PATCH v3 6/7] build-system: emacs: Use native compilation.
From: |
Liliana Marie Prikler |
Subject: |
[bug#57086] [PATCH v3 6/7] build-system: emacs: Use native compilation. |
Date: |
Thu, 25 Aug 2022 07:25:05 -0000 |
* guix/build/emacs-build-system.scm (add-install-to-native-load-path):
New variable.
(build): Replace ‘emacs-byte-compile-directory’ with ‘emacs-compile-directory’.
Delete already compiled files in the working directory prior to compilation.
(%standard-phases): Add ‘add-install-to-native-load-path’ after
‘expand-load-path’.
---
guix/build/emacs-build-system.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/guix/build/emacs-build-system.scm
b/guix/build/emacs-build-system.scm
index 6a6918bfdd..3808b60445 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -108,13 +108,29 @@ (define* (expand-load-path #:key (prepend-source? #t)
#:allow-other-keys)
(format #t "expanded load paths for ~{~a~^, ~}\n"
(map basename diff))))))
+(define* (add-install-to-native-load-path #:key outputs #:allow-other-keys)
+ "Append the native-site-lisp of OUTPUT to EMACSNATIVELOADPATH."
+ (let ((native-load-path (or (false-if-exception
+ (string-split (getenv "EMACSNATIVELOADPATH")
#\:))
+ '()))
+ (install-directory (string-append (assoc-ref outputs "out")
+ "/lib/emacs/native-site-lisp")))
+ (setenv "EMACSNATIVELOADPATH"
+ ;; Emacs pushes these directories in reverse order, so the
+ ;; last one will be the first.
+ (string-join `(,@native-load-path ,install-directory)
+ ":"))))
+
(define* (build #:key outputs inputs #:allow-other-keys)
"Compile .el files."
+ ;; Ensure that already compiled files in the working directory don't shadow
+ ;; the build. Might happen, because check runs first.
+ (for-each delete-file (find-files "." "\\.el[cn]$"))
(let* ((emacs (search-input-file inputs "/bin/emacs"))
(out (assoc-ref outputs "out")))
(setenv "SHELL" "sh")
(parameterize ((%emacs emacs))
- (emacs-byte-compile-directory (elpa-directory out)))))
+ (emacs-compile-directory (elpa-directory out)))))
(define* (patch-el-files #:key outputs #:allow-other-keys)
"Substitute the absolute \"/bin/\" directory with the right location in the
@@ -343,6 +359,8 @@ (define %standard-phases
(modify-phases gnu:%standard-phases
(replace 'unpack unpack)
(add-after 'unpack 'expand-load-path expand-load-path)
+ (add-after 'expand-load-path 'add-install-to-native-load-path
+ add-install-to-native-load-path)
(delete 'bootstrap)
(delete 'configure)
(delete 'build)
--
2.37.2
- [bug#57086] [PATCH 1/6] gnu: Parameterize libgccjit., (continued)
- [bug#57086] [PATCH 1/6] gnu: Parameterize libgccjit., Liliana Marie Prikler, 2022/08/09
- [bug#57086] [PATCH 2/6] gnu: libgccjit: Build with bootstrapped gcc., Liliana Marie Prikler, 2022/08/09
- [bug#57086] [PATCH 0/6] Add native compilation to Emacs, (, 2022/08/09
- [bug#57086] [PATCH v3 0/7] Add native compilation to Emacs, Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 2/7] gnu: libgccjit: Build with bootstrapped gcc., Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 3/7] gnu: libgccjit: Build multiple versions., Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 5/7] guix: emacs-utils: Add emacs-compile-directory., Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 6/7] build-system: emacs: Use native compilation.,
Liliana Marie Prikler <=
- [bug#57086] [PATCH v3 7/7] gnu: emacs-yasnippet: Fix build., Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 4/7] gnu: emacs: Build with native compilation., Liliana Marie Prikler, 2022/08/25
- [bug#57086] [PATCH v3 1/7] gnu: Parameterize libgccjit., Liliana Marie Prikler, 2022/08/25