diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2018-01-20 15:42:00 -0500 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2018-01-20 21:48:47 -0500 |
| commit | 75033216ea9f7583d113e999f7b8ce30bbef2bca (patch) | |
| tree | 176e6c39d924e677c631bea78acbd868450cc7ca | |
| parent | 7c291296955ed926377810cb61e251a808f98717 (diff) | |
| download | guix-75033216ea9f7583d113e999f7b8ce30bbef2bca.tar.gz | |
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.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/lisp.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/clisp-glibc-2.26.patch | 20 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c8c31e1b9d..865d1eae88 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 8427a19714..10c49e0c0c 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 0000000000..c8920ceccc --- /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 <adconrad@ubuntu.com> +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 <sebastien@debian.org> +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)) |