mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-21 01:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-emacsql: Adjust to changes in emacs-build-system.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-emacsql)[#:phases]: Use standard build and
install phases.
[build-emacsql-sqlite]: Use cc-for-target.
This commit is contained in:
Leo Prikler 2021-04-17 19:06:24 +02:00
parent 7549981cec
commit 710c6f49db
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/emacs-xyz.scm
View file

@ -15641,7 +15641,6 @@ (define-public emacs-emacsql
(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")
@ -15652,7 +15651,7 @@ (define-public emacs-emacsql
(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)
@ -15673,16 +15672,7 @@ (define-public emacs-emacsql
;; 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")