From 2ad266a618a98539d7a17a99756db66e3dfaa5cc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 2 May 2019 11:44:01 +0200 Subject: [PATCH] sbcl: update to 1.5.2. --- srcpkgs/sbcl/patches/musl-fixes.patch | 20 ++++++++------------ srcpkgs/sbcl/template | 9 +++------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/srcpkgs/sbcl/patches/musl-fixes.patch b/srcpkgs/sbcl/patches/musl-fixes.patch index f0d179720b8..c626d19b416 100644 --- a/srcpkgs/sbcl/patches/musl-fixes.patch +++ b/srcpkgs/sbcl/patches/musl-fixes.patch @@ -10,18 +10,6 @@ #include "os.h" #include "signal.h" #include "thread.h" ---- src/runtime/interrupt.h 2016-11-30 08:07:36.000000000 +1100 -+++ src/runtime/interrupt.h 2016-12-23 22:01:01.750119405 +1100 -@@ -14,6 +14,9 @@ - - #include "runtime.h" - #include -+#ifndef __GLIBC__ -+#include -+#endif - - extern void get_current_sigmask(sigset_t *sigset); - --- src/runtime/linux-os.h 2016-11-30 08:07:36.000000000 +1100 +++ src/runtime/linux-os.h 2016-12-23 22:01:51.218121957 +1100 @@ -24,7 +24,11 @@ @@ -99,3 +87,11 @@ size_t n = confstr (_CS_GNU_LIBPTHREAD_VERSION, NULL, 0); if (n > 0) { char *buf = alloca (n); +--- src/runtime/memcpy.h.orig ++++ src/runtime/memcpy.h +@@ -1,4 +1,4 @@ +-#ifdef __linux__ ++#ifdef __GLIBC__ + #ifdef __amd64__ + #ifdef __ASSEMBLER__ + .symver memcpy,memcpy@GLIBC_2.2.5 diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 035ee928c7a..a3492f7ef54 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.5.1 +version=1.5.2 revision=1 archs="i686 x86_64* armv7l aarch64" @@ -13,7 +13,7 @@ license="custom" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=f072cbab325062202e7b9147f44a42c99c78e3c159e8916609b54ea01616e623 +checksum=dac6aef3ec7628c284a31f2222ede5d47d9d94f9cfdffe0f00ef40f9531e3c3f nocross=yes nopie=yes @@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" 3222284f2fa848fc95a8932eef9ccd18662720d3fbdb7ab2464cc51fd8e1ba76" + checksum+=" 22ccd9409b2ea16d4be69235c5ad5fde833452955cb24483815312d3b1d7401c" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" @@ -35,9 +35,6 @@ aarch64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2" checksum+=" 494829f8e3ea7eb1c308b343cc390daf94a6215030a5f2b9ee0cded67511e918" ;; -x86_64-musl) - broken="/usr/bin/ld: final link failed: nonrepresentable section on output" - ;; *-musl) makedepends+=" ccl" _bootstrap_lisp="ccl --batch --quiet --no-init"