guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: racket: Fix incompatibility with libedit.


From: ???
Subject: 01/01: gnu: racket: Fix incompatibility with libedit.
Date: Thu, 13 Sep 2018 08:33:27 -0400 (EDT)

iyzsong pushed a commit to branch master
in repository guix.

commit 26700caed91b967bf365e29eb576cc23b84a502f
Author: 宋文武 <address@hidden>
Date:   Thu Sep 13 19:28:36 2018 +0800

    gnu: racket: Fix incompatibility with libedit.
    
    The former patching made racket detecting libedit as the old 2.11 version,
    which leads to failure:
    <https://lists.gnu.org/archive/html/help-guix/2018-09/msg00027.html>.
    
    * gnu/packages/scheme.scm (racket)[arguments]: Patch the 'ffi-lib' call of
    libedit using 'PLT_READLINE_LIB'.
---
 gnu/packages/scheme.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 926169c..2e46a84 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -460,6 +460,9 @@ implementation techniques and as an expository tool.")
                (substitute* 
"share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt"
                  (("ffi-lib libmpfr-so")
                   (format #f "ffi-lib \"~a\"" (find-so "libmpfr"))))
+               (substitute* "share/pkgs/readline-lib/readline/rktrl.rkt"
+                 (("\\(getenv \"PLT_READLINE_LIB\"\\)")
+                  (format #f "\"~a\"" (find-so "libedit"))))
                (for-each
                 (lambda (x) (apply patch-ffi-libs x))
                 '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt"
@@ -487,9 +490,7 @@ implementation techniques and as an expository tool.")
                   ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt"
                    ("libGL"))
                   ("share/pkgs/sgl/gl.rkt"
-                   ("libGL" "libGLU"))
-                  ("share/pkgs/readline-lib/readline/rktrl.rkt"
-                   ("libedit")))))
+                   ("libGL" "libGLU")))))
              (chdir "src")
              #t))
          (add-after 'unpack 'patch-/bin/sh



reply via email to

[Prev in Thread] Current Thread [Next in Thread]