Patchwork [3/3] gnu: ecl: Wrap with PATH, CPATH, LIBRARY_PATH and LD_LIBRARY_PATH

login
register
mail settings
Submitter Andy Patterson
Date July 25, 2016, 1:05 a.m.
Message ID <20160725010539.26878-4-ajpatter@uwaterloo.ca>
Download mbox | patch
Permalink /patch/13968/
State New
Headers show

Comments

Andy Patterson - July 25, 2016, 1:05 a.m.
* gnu/packages/lisp.scm (ecl)[arguments]: Wrap with PATH, CPATH,
  LIBRARY_PATH and LD_LIBRARY_PATH
---
 gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)
Ludovic Courtès - July 25, 2016, 8:50 a.m.
Andy Patterson <ajpatter@uwaterloo.ca> skribis:

> * gnu/packages/lisp.scm (ecl)[arguments]: Wrap with PATH, CPATH,
>   LIBRARY_PATH and LD_LIBRARY_PATH

[...]

> +              ("libffi" ,libffi)
> +              ("linux-headers" ,linux-libre-headers)
> +              ("gcc" ,gcc)
> +              ("binutils" ,binutils)
> +              ("ld-wrapper" ,(make-ld-wrapper "ld-wrapper" #:binutils binutils))
> +              ("libc" ,glibc)))

I removed these inputs because they’re implicit and don’t need to be
added.

> +                    (binaries '("gcc" "binutils" "ld-wrapper"))

I also moved ld-wrapper before binutils so that ld-wrappers ‘ld’ command
is picked up.

Pushed, thank you!

Ludo’.

Patch

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 1c7a791..8769410 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -4,6 +4,7 @@ 
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,10 +34,12 @@ 
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libffcall)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages libsigsegv)
   #:use-module (gnu packages admin)
@@ -117,7 +120,12 @@  interface to the Tk widget system.")
     (inputs `(("gmp" ,gmp)
               ("libatomic-ops" ,libatomic-ops)
               ("libgc" ,libgc)
-              ("libffi" ,libffi)))
+              ("libffi" ,libffi)
+              ("linux-headers" ,linux-libre-headers)
+              ("gcc" ,gcc)
+              ("binutils" ,binutils)
+              ("ld-wrapper" ,(make-ld-wrapper "ld-wrapper" #:binutils binutils))
+              ("libc" ,glibc)))
     (arguments
      '(#:tests? #t
        #:make-flags `(,(string-append "ECL="
@@ -127,7 +135,28 @@  interface to the Tk widget system.")
        #:phases
        (modify-phases %standard-phases
          (delete 'check)
-         (add-after 'install 'check (assoc-ref %standard-phases 'check)))))
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((ecl (assoc-ref outputs "out"))
+                    (input-path (lambda (lib path)
+                                    (string-append
+                                     (assoc-ref inputs lib) path)))
+                    (libraries '("gmp" "libatomic-ops" "libgc" "libffi" "libc"))
+                    (binaries '("gcc" "binutils" "ld-wrapper"))
+                    (library-directories
+                     (map (lambda (lib) (input-path lib "/lib"))
+                          libraries)))
+
+               (wrap-program (string-append ecl "/bin/ecl")
+                 `("PATH" prefix
+                   ,(map (lambda (binary) (input-path binary "/bin"))
+                         binaries))
+                 `("CPATH" suffix
+                   ,(map (lambda (lib) (input-path lib "/include"))
+                         `("linux-headers" ,@libraries)))
+                 `("LIBRARY_PATH" suffix ,library-directories)
+                 `("LD_LIBRARY_PATH" suffix ,library-directories)))))
+         (add-after 'wrap 'check (assoc-ref %standard-phases 'check)))))
     (home-page "http://ecls.sourceforge.net/")
     (synopsis "Embeddable Common Lisp")
     (description "ECL is an implementation of the Common Lisp language as