[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-emacs updated: gnu: emacs-emacsql: Adjust to changes in emacs
From: |
guix-commits |
Subject: |
branch wip-emacs updated: gnu: emacs-emacsql: Adjust to changes in emacs-build-system. |
Date: |
Sat, 03 Apr 2021 11:26:13 -0400 |
This is an automated email from the git hooks/post-receive script.
leoprikler pushed a commit to branch wip-emacs
in repository guix.
The following commit(s) were added to refs/heads/wip-emacs by this push:
new 2be3daa gnu: emacs-emacsql: Adjust to changes in emacs-build-system.
2be3daa is described below
commit 2be3daa19d2fd47933c622995d2f2dde714075e6
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Sat Apr 3 17:25:31 2021 +0200
gnu: emacs-emacsql: Adjust to changes in emacs-build-system.
* gnu/packages/emacs-xyz.scm (emacs-emacsql)[#:phases]: Use standard build
and
install phases.
[build-emacsql-sqlite]: Use cc-for-target.
---
gnu/packages/emacs-xyz.scm | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0bd7fe8..0382cfd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15490,7 +15490,6 @@ object has been freed.")
(srfi srfi-26))
#:phases
(modify-phases %standard-phases
- (delete 'build) ;‘build-emacsql-sqlite’ compiles ‘*.el’ files.
(add-before 'install 'patch-elisp-shell-shebangs
(lambda _
(substitute* (find-files "." "\\.el")
@@ -15501,7 +15500,7 @@ object has been freed.")
(setenv "SHELL" "sh")))
(add-after 'setenv-shell 'build-emacsql-sqlite
(lambda _
- (invoke "make" "binary" "CC=gcc")))
+ (invoke "make" "binary" (string-append "CC=" ,(cc-for-target)))))
(add-after 'build-emacsql-sqlite 'install-emacsql-sqlite
;; This build phase installs emacs-emacsql binary.
(lambda* (#:key outputs #:allow-other-keys)
@@ -15522,16 +15521,7 @@ object has been freed.")
;; in the right place.
("(defvar emacsql-sqlite-executable"
(string-append (assoc-ref outputs "out")
- "/bin/emacsql-sqlite"))))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (install-file "sqlite/emacsql-sqlite"
- (string-append out "/bin"))
- (for-each (cut install-file <>
- (string-append out "/share/emacs/site-lisp"))
- (find-files "." "\\.elc*$")))
- #t)))))
+ "/bin/emacsql-sqlite")))))))))
(inputs
`(("emacs-minimal" ,emacs-minimal)
("mariadb" ,mariadb "lib")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-emacs updated: gnu: emacs-emacsql: Adjust to changes in emacs-build-system.,
guix-commits <=