guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: clisp: Fix build with glibc 2.26.


From: Kei Kebreau
Subject: 01/01: gnu: clisp: Fix build with glibc 2.26.
Date: Sun, 21 Jan 2018 21:35:25 -0500 (EST)

kkebreau pushed a commit to branch core-updates
in repository guix.

commit 75033216ea9f7583d113e999f7b8ce30bbef2bca
Author: Kei Kebreau <address@hidden>
Date:   Sat Jan 20 15:42:00 2018 -0500

    gnu: clisp: Fix build with glibc 2.26.
    
    * gnu/packages/patches/clisp-glibc-2.26.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/lisp.scm (clisp)[source]: Use it.
---
 gnu/local.mk                                |  1 +
 gnu/packages/lisp.scm                       |  3 ++-
 gnu/packages/patches/clisp-glibc-2.26.patch | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index c8c31e1..865d1ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -581,6 +581,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/clang-runtime-asan-build-fixes.patch    \
   %D%/packages/patches/clang-runtime-esan-build-fixes.patch    \
   %D%/packages/patches/clementine-use-openssl.patch            \
+  %D%/packages/patches/clisp-glibc-2.26.patch                  \
   %D%/packages/patches/clisp-remove-failing-test.patch         \
   %D%/packages/patches/clucene-pkgconfig.patch                 \
   %D%/packages/patches/clx-remove-demo.patch                   \
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 8427a19..10c49e0 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -262,7 +262,8 @@ supporting ASDF, Sockets, Gray streams, MOP, and other 
useful components.")
        (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32 "0qjv3z274rbdmb941hy03hl63f4z7bmci234f8dyz4skgfr82d3i"))
-       (patches (search-patches "clisp-remove-failing-test.patch"))))
+       (patches (search-patches "clisp-glibc-2.26.patch"
+                                "clisp-remove-failing-test.patch"))))
     (build-system gnu-build-system)
     (inputs `(("libffcall" ,libffcall)
               ("ncurses" ,ncurses)
diff --git a/gnu/packages/patches/clisp-glibc-2.26.patch 
b/gnu/packages/patches/clisp-glibc-2.26.patch
new file mode 100644
index 0000000..c8920ce
--- /dev/null
+++ b/gnu/packages/patches/clisp-glibc-2.26.patch
@@ -0,0 +1,20 @@
+This patch comes from Debian.
+
+Description: cfree is not present in glibc-2.26, stop wrapping it
+Author: Adam Conrad <address@hidden>
+Bug: https://sourceforge.net/p/clisp/bugs/717/
+Bug-Debian: https://bugs.debian.org/880686
+Applied-Upstream: 
https://sourceforge.net/p/clisp/clisp/ci/3bc928712d150ff1e5f6b2bfb7838655f3ff52fa/
+Reviewed-By: S├ębastien Villemot <address@hidden>
+Last-Update: 2017-11-27
+
+--- clisp-2.49.20170913.orig/modules/bindings/glibc/linux.lisp
++++ clisp-2.49.20170913/modules/bindings/glibc/linux.lisp
+@@ -649,7 +649,6 @@
+ (def-call-out calloc (:arguments (nmemb size_t) (size size_t))
+   (:return-type c-pointer))
+ (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
+-(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
+ (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
+ 
+ (def-call-out abort (:arguments) (:return-type nil))



reply via email to

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