Re: A new wip-emacs branch

[Xinglu Chen]

On Sat, Apr 03 2021, Xinglu Chen wrote:

> I tried the 'wip-emacs' branch (commit
> b18d605fcb51bcce56a1114f82645658db9f5b14), and I noticed that
> 'emacs-emacsql' was failing to install.  The 'make-autoloads' phase
> fails with:

I was able to fix this with the attached patch.

>From 59e3acc0bebe97e33c5ea557f40eddf6467cfff7 Mon Sep 17 00:00:00 2001
Message-Id: 
<59e3acc0bebe97e33c5ea557f40eddf6467cfff7.1617450934.git.public@yoctocell.xyz>
From: Xinglu Chen <public@yoctocell.xyz>
Date: Sat, 3 Apr 2021 13:52:05 +0200
Subject: [PATCH wip-emacs] gnu: emacs-emacsql: Adjust to changes in
 emacs-build-system.

* gnu/packages/emacs-xyz.scm (emacs-emacsql)[#:phases]: Update install
directory for bytecompiled Emacs Lisp files.
---
 gnu/packages/emacs-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0bd7fe8f27..cd0138663f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15529,7 +15529,9 @@ object has been freed.")
                (install-file "sqlite/emacsql-sqlite"
                              (string-append out "/bin"))
                (for-each (cut install-file <>
-                              (string-append out "/share/emacs/site-lisp"))
+                              (string-append out
+                                             "/share/emacs/site-lisp/emacsql-"
+                                             ,(package-version this-package)))
                          (find-files "." "\\.elc*$")))
              #t)))))
     (inputs

base-commit: b18d605fcb51bcce56a1114f82645658db9f5b14
-- 
2.31.1