GNU bug report logs - #26119
[PATCH] ccl: Install the included libraries.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26119 in the body.
You can then email your comments to 26119 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Patterson <ajpatter <at> uwaterloo.ca>
To: guix-patches <at> gnu.org
Subject: [PATCH] ccl: Install the included libraries.
Date: Wed, 15 Mar 2017 21:54:52 -0400

Hi,

I figured it'd make sense to send these patches here for discussion and
review. This is in reference to
<https://lists.gnu.org/archive/html/help-guix/2017-03/msg00049.html>.

Thanks,

--
Andy

Message #8 received at 26119 <at> debbugs.gnu.org (full text, mbox):

From: Andy Patterson <ajpatter <at> uwaterloo.ca>
To: 26119 <at> debbugs.gnu.org
Cc: Andy Patterson <ajpatter <at> uwaterloo.ca>
Subject: [PATCH 1/2] gnu: ccl: Install included libraries.
Date: Wed, 15 Mar 2017 22:12:10 -0400

* gnu/packages/lisp.scm (ccl)[arguments]: Add 'srfi-26' to '#:modules', and
copy the included libraries to the output in the 'install' phase.
---
 gnu/packages/lisp.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index b7465e304..0303fe1d3 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -412,6 +412,9 @@ statistical profiler, a code coverage tool, and many other extensions.")
        ("subversion" ,subversion)))
     (arguments
      `(#:tests? #f                      ;no 'check' target
+       #:modules ((srfi srfi-26)
+                  (guix build utils)
+                  (guix build gnu-build-system))
        #:phases
        (alist-replace
         'unpack
@@ -463,10 +466,16 @@ statistical profiler, a code coverage tool, and many other extensions.")
                         ;; "guix package --search="
                         (_              "UNSUPPORTED")))
                     (heap (string-append kernel ".image")))
-               (mkdir-p libdir)
+               (install-file kernel libdir)
+               (install-file heap libdir)
+
+               (let ((dirs '("lib" "library" "examples" "contrib"
+                             "tools" "objc-bridge")))
+                 (for-each copy-recursively
+                           dirs
+                           (map (cut string-append libdir <>) dirs)))
+
                (mkdir-p bindir)
-               (copy-file kernel (string-append libdir kernel))
-               (copy-file heap (string-append libdir heap))
                (with-output-to-file wrapper
                  (lambda ()
                    (display
-- 
2.11.1

Message #11 received at 26119 <at> debbugs.gnu.org (full text, mbox):

From: Andy Patterson <ajpatter <at> uwaterloo.ca>
To: 26119 <at> debbugs.gnu.org
Cc: Andy Patterson <ajpatter <at> uwaterloo.ca>
Subject: [PATCH 2/2] gnu: ccl: Forcibly set CCL_DEFAULT_DIRECTORY.
Date: Wed, 15 Mar 2017 22:12:11 -0400

* gnu/packages/lisp.scm (ccl)[arguments]: Unconditionally set the
CCL_DEFAULT_DIRECTORY environment variable in the wrapper script.
---
 gnu/packages/lisp.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 0303fe1d3..fd6bdd3e4 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -481,9 +481,7 @@ statistical profiler, a code coverage tool, and many other extensions.")
                    (display
                     (string-append
                      "#!" bash "/bin/sh\n"
-                     "if [ -z \"$CCL_DEFAULT_DIRECTORY\" ]; then\n"
-                     "    CCL_DEFAULT_DIRECTORY=" libdir "\n"
-                     "fi\n"
+                     "CCL_DEFAULT_DIRECTORY=" libdir "\n"
                      "export CCL_DEFAULT_DIRECTORY\n"
                      "exec " libdir kernel "\n"))))
                (chmod wrapper #o755)))
-- 
2.11.1

Message #16 received at 26119-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Andy Patterson <ajpatter <at> uwaterloo.ca>
Cc: 26119-done <at> debbugs.gnu.org
Subject: Re: bug#26119: [PATCH 1/2] gnu: ccl: Install included libraries.
Date: Thu, 30 Mar 2017 11:05:00 +0200

Hi Andy,

Andy Patterson <ajpatter <at> uwaterloo.ca> skribis:

> * gnu/packages/lisp.scm (ccl)[arguments]: Add 'srfi-26' to '#:modules', and
> copy the included libraries to the output in the 'install' phase.

[...]

> * gnu/packages/lisp.scm (ccl)[arguments]: Unconditionally set the
> CCL_DEFAULT_DIRECTORY environment variable in the wrapper script.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.