From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed5jq-0001nL-Il for guix-patches@gnu.org; Sat, 20 Jan 2018 21:52:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ed5jm-0002Kq-N7 for guix-patches@gnu.org; Sat, 20 Jan 2018 21:52:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:56788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ed5jm-0002Ke-JH for guix-patches@gnu.org; Sat, 20 Jan 2018 21:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ed5jm-0002Sx-8H for guix-patches@gnu.org; Sat, 20 Jan 2018 21:52:02 -0500 Subject: [bug#30188] [PATCH] gnu: clisp: Fix build with glibc 2.26. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ed5il-0001cs-Q1 for guix-patches@gnu.org; Sat, 20 Jan 2018 21:51:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ed5ih-0001XS-TE for guix-patches@gnu.org; Sat, 20 Jan 2018 21:50:59 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ed5ih-0001WC-FJ for guix-patches@gnu.org; Sat, 20 Jan 2018 21:50:55 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9069220DE8 for ; Sun, 21 Jan 2018 03:50:52 +0100 (CET) From: Kei Kebreau Date: Sat, 20 Jan 2018 21:50:19 -0500 Message-Id: <20180121025019.10489-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30188@debbugs.gnu.org Cc: Kei Kebreau * 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(-) create mode 100644 gnu/packages/patches/clisp-glibc-2.26.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8c31e1b9..865d1eae8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -581,6 +581,7 @@ dist_patch_DATA =3D \ %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 8427a1971..10c49e0c0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -262,7 +262,8 @@ supporting ASDF, Sockets, Gray streams, MOP, and othe= r 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/p= atches/clisp-glibc-2.26.patch new file mode 100644 index 000000000..c8920cecc --- /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 +Bug: https://sourceforge.net/p/clisp/bugs/717/ +Bug-Debian: https://bugs.debian.org/880686 +Applied-Upstream: https://sourceforge.net/p/clisp/clisp/ci/3bc928712d150= ff1e5f6b2bfb7838655f3ff52fa/ +Reviewed-By: S=C3=A9bastien Villemot +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= )) +=20 + (def-call-out abort (:arguments) (:return-type nil)) --=20 2.15.1