[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47661] [PATCH 09/33] gnu: emacs-emacsql: Adjust to changes in emacs
From: |
Leo Prikler |
Subject: |
[bug#47661] [PATCH 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system. |
Date: |
Thu, 8 Apr 2021 19:49:43 +0200 |
* 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 8861909bf1..79c3c42613 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")
--
2.31.1
- [bug#47661] [PATCH 00/33] Improve Emacs UX., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 01/33] profiles: Add hook for Emacs subdirs., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 02/33] gnu: emacs: Wrap EMACSLOADPATH., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 08/33] gnu: Add emacs-telega-contrib., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 04/33] build-system: emacs: Use subdirectories again., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 03/33] gnu: emacs: Patch more program file names., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system.,
Leo Prikler <=
- [bug#47661] [PATCH 10/33] gnu: emacs-howm: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 06/33] gnu: emacs-guix: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 12/33] gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 15/33] gnu: emacs-sly-stepper: Remove generated sources., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08