diff options
| author | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-04-17 19:06:24 +0200 |
|---|---|---|
| committer | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-05-01 15:56:38 +0200 |
| commit | 710c6f49db124b0dea4dbf38dfca76428b8a3f74 (patch) | |
| tree | 0e056b03f9b312b205550bae2a88acf908e9344f | |
| parent | 7549981cecf66c059d9df46e9844d5daeec83ed2 (diff) | |
| download | guix-710c6f49db124b0dea4dbf38dfca76428b8a3f74.tar guix-710c6f49db124b0dea4dbf38dfca76428b8a3f74.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6740535342..95ce9d58a7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15641,7 +15641,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") @@ -15652,7 +15651,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) @@ -15673,16 +15672,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") |