testing/sbcl: upgrade to 2.0.5

4 files changed, 3 insertions, 219 deletions

diff --git a/testing/sbcl/0001-Fix-sb-bsd-sockets-on-musl-libc.patch b/testing/sbcl/0001-Fix-sb-bsd-sockets-on-musl-libc.patch
deleted file mode 100644
index 88497a41b3..0000000000
--- a/testing/sbcl/0001-Fix-sb-bsd-sockets-on-musl-libc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#2020/01/30 Patch has not yet been accepted upstream
-From be70a77e2b06e2442b38093adbe84b15ea065c8f Mon Sep 17 00:00:00 2001
-From: Eric Timmons <etimmons@mit.edu>
-Date: Sat, 1 Feb 2020 15:38:19 -0500
-Subject: [PATCH 1/5] Make sb-bsd-sockets robust to the absence of NETDB_*
-
-NETDB_INTERNAL and NETDB_SUCCESS are not defined by all libc
-implementations (see: musl libc). If groveling fails for these values, set them
-to NIL which effectively disables the corresponding Lisp conditions from being
-signaled.
----
- contrib/sb-bsd-sockets/name-service.lisp | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/sb-bsd-sockets/name-service.lisp b/contrib/sb-bsd-sockets/name-service.lisp
-index 34c7262ea..97b505a5e 100644
---- a/contrib/sb-bsd-sockets/name-service.lisp
-+++ b/contrib/sb-bsd-sockets/name-service.lisp
-@@ -1,5 +1,16 @@
- (in-package :sb-bsd-sockets)
- 
-+;; If we're unable to grovel for NETDB_INTERNAL and NETDB_SUCCESS (not every
-+;; libc sets them), set their constants to NIL. This effectively makes their
-+;; respective conditions unreachable.
-+#-win32
-+(eval-when (:compile-toplevel :load-toplevel :execute)
-+  (unless (constantp 'sockint::netdb-internal)
-+    (defconstant sockint::netdb-internal nil "See errno."))
-+  (unless (constantp 'sockint::netdb-success)
-+    (defconstant sockint::netdb-success nil "No problem.")))
-+
-+
- (defclass host-ent ()
-   ((name :initarg :name :reader host-ent-name
-          :documentation "The name of the host")
-@@ -195,7 +206,7 @@ (defun name-service-error (where &optional errno)
-   (let ((*name-service-errno* (get-name-service-errno errno)))
-     ;; Comment next to NETDB_INTERNAL in netdb.h says "See errno.".
-     ;; This special case treatment hasn't actually been tested yet.
--    (if (and #-win32 (= *name-service-errno* sockint::NETDB-INTERNAL))
-+    (if (and #-win32 sockint::netdb-internal #-win32 (= *name-service-errno* sockint::NETDB-INTERNAL))
-         (socket-error where)
-         (let ((condition
-                (condition-for-name-service-errno *name-service-errno*)))
--- 
-2.25.0
-
diff --git a/testing/sbcl/0002-Fix-threads-on-musl-libc.patch b/testing/sbcl/0002-Fix-threads-on-musl-libc.patch
deleted file mode 100644
index 7561e9182c..0000000000
--- a/testing/sbcl/0002-Fix-threads-on-musl-libc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-#2020/01/30 Patch has not yet been accepted upstream
-From 51ee0c90068ef7d88a23d86579cc1f73c2f6055f Mon Sep 17 00:00:00 2001
-From: Eric Timmons <etimmons@mit.edu>
-Date: Sat, 1 Feb 2020 17:33:38 -0500
-Subject: [PATCH 2/5] Do not require _CS_GNU_LIBPTHREAD_VERSION at runtime
- start
-
-If there is no content in confstr for _CS_GNU_LIBPTHREAD_VERSION (i.e., on a
-non GNU libc) then assume the thread implementation is good enough and let the
-user deal with any fallout.
----
- src/runtime/linux-os.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
-index 89244e793..0ff55653d 100644
---- a/src/runtime/linux-os.c
-+++ b/src/runtime/linux-os.c
-@@ -186,8 +186,13 @@ isnptl (void)
-       if (strstr (buf, "NPTL")) {
-           return 1;
-       }
-+      return 0;
-+  }
-+  else {
-+      /* This libc does not expose the libpthread version. Just assume we have
-+       * a good enough thread implementation. */
-+      return 1;
-   }
--  return 0;
- }
- #endif
- 
--- 
-2.25.0
-
diff --git a/testing/sbcl/0003-Fix-foreign-tests-on-musl-libc.patch b/testing/sbcl/0003-Fix-foreign-tests-on-musl-libc.patch
deleted file mode 100644
index 2c4da211a0..0000000000
--- a/testing/sbcl/0003-Fix-foreign-tests-on-musl-libc.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-#2020/01/30 Patch has not yet been accepted upstream
-From 87b1eca2b719fb5e2d6f10352dcdb86f4d389ca9 Mon Sep 17 00:00:00 2001
-From: Eric Timmons <etimmons@mit.edu>
-Date: Sat, 1 Feb 2020 17:33:59 -0500
-Subject: [PATCH 3/5] Teach foreign.test.sh about noop dlclose implementations
-
-Musl libc's implementation of dlclose(3) is (intentionally) a noop (see:
-https://wiki.musl-libc.org/functional-differences-from-glibc.html). When
-running regression tests, test if dlclose is a noop and if so, skip all tests
-that depend on objects being unmapped.
----
- src/code/foreign-load.lisp |  2 +-
- tests/foreign.test.sh      | 67 ++++++++++++++++++++++++++++----------
- 2 files changed, 51 insertions(+), 18 deletions(-)
-
-diff --git a/src/code/foreign-load.lisp b/src/code/foreign-load.lisp
-index ada107c36..4510f2ccf 100644
---- a/src/code/foreign-load.lisp
-+++ b/src/code/foreign-load.lisp
-@@ -48,7 +48,7 @@ (defun load-shared-object (pathname &key dont-save)
- definitions; if a symbol was previously referenced through the object and
- is not present in the reloaded version an error will be signalled. Reloading
- may not work as expected if user or library-code has called dlopen(3) on the
--same shared object.
-+same shared object or running on a system where dlclose(3) is a noop.
- 
- LOAD-SHARED-OBJECT interacts with SB-EXT:SAVE-LISP-AND-DIE:
- 
-diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
-index fabba1246..53131bdd2 100755
---- a/tests/foreign.test.sh
-+++ b/tests/foreign.test.sh
-@@ -140,6 +140,28 @@ echo 'int late_foo = 43;' > $TEST_FILESTEM-c.c
- echo 'int late_bar() { return 14; }' >> $TEST_FILESTEM-c.c
- build_so $TEST_FILESTEM-c
- 
-+cat > $TEST_FILESTEM-noop-dlclose-test.c <<EOF
-+#include <dlfcn.h>
-+#include <stddef.h>
-+
-+int dlclose_is_noop () {
-+    void * handle = dlopen("./$TEST_FILESTEM-noop-dlclose-test-helper.so", RTLD_NOW | RTLD_GLOBAL);
-+    dlclose(handle);
-+
-+    handle = dlopen("./$TEST_FILESTEM-noop-dlclose-test-helper.so", RTLD_NOW | RTLD_NOLOAD);
-+    if (handle != NULL) {
-+        return 1;
-+    }
-+    return 0;
-+}
-+EOF
-+build_so $TEST_FILESTEM-noop-dlclose-test
-+
-+cat > $TEST_FILESTEM-noop-dlclose-test-helper.c <<EOF
-+int sbcl_dlclose_test = 42;
-+EOF
-+build_so $TEST_FILESTEM-noop-dlclose-test-helper
-+
- ## Foreign definitions & load
- 
- cat > $TEST_FILESTEM.base.lisp <<EOF
-@@ -246,20 +268,28 @@ cat > $TEST_FILESTEM.test.lisp <<EOF
- 
-   (note "/initial assertions ok")
- 
-+  ;; determine if dlclose is a noop.
-+  (load-shared-object (truename "$TEST_FILESTEM-noop-dlclose-test.so"))
-+  (define-alien-routine dlclose-is-noop int)
-+  (defparameter *dlclose-noop-p* (plusp (dlclose-is-noop)))
-+
-   ;; test reloading object file with new definitions
-   (assert (= 13 foo))
-   (assert (= 42 (bar)))
-   (note "/original definitions ok")
--  (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak")
--  (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so")
--  (load-shared-object (truename "$TEST_FILESTEM-b.so"))
--  (note "/reloading ok")
--  (assert (= 42 foo))
--  (assert (= 13 (bar)))
--  (note "/redefined versions ok")
--  (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so")
--  (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so")
--  (note "/renamed back to originals")
-+  (if *dlclose-noop-p*
-+      (note "/skipping reloading tests")
-+      (progn
-+        (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b.bak")
-+        (rename-file "$TEST_FILESTEM-b2.so" "$TEST_FILESTEM-b.so")
-+        (load-shared-object (truename "$TEST_FILESTEM-b.so"))
-+        (note "/reloading ok")
-+        (assert (= 42 foo))
-+        (assert (= 13 (bar)))
-+        (note "/redefined versions ok")
-+        (rename-file "$TEST_FILESTEM-b.so" "$TEST_FILESTEM-b2.so")
-+        (rename-file "$TEST_FILESTEM-b.bak" "$TEST_FILESTEM-b.so")
-+        (note "/renamed back to originals")))
- 
-   ;; test late resolution
-   #+linkage-table
-@@ -276,13 +306,16 @@ cat > $TEST_FILESTEM.test.lisp <<EOF
-     (load-shared-object (truename "$TEST_FILESTEM-c.so"))
-     (assert (= 43 late-foo))
-     (assert (= 14 (late-bar)))
--    (unload-shared-object (truename "$TEST_FILESTEM-c.so"))
--    (multiple-value-bind (val err) (ignore-errors late-foo)
--      (assert (not val))
--      (assert (typep err 'undefined-alien-error)))
--    (multiple-value-bind (val err) (ignore-errors (late-bar))
--      (assert (not val))
--      (assert (typep err 'undefined-alien-error)))
-+    (if *dlclose-noop-p*
-+        (note "/skipping linkage table unloading tests")
-+        (progn
-+          (unload-shared-object (truename "$TEST_FILESTEM-c.so"))
-+          (multiple-value-bind (val err) (ignore-errors late-foo)
-+            (assert (not val))
-+            (assert (typep err 'undefined-alien-error)))
-+          (multiple-value-bind (val err) (ignore-errors (late-bar))
-+            (assert (not val))
-+            (assert (typep err 'undefined-alien-error)))))
-     (note "/linkage table ok"))
- 
-   (sb-ext:exit :code $EXIT_LISP_WIN) ; success convention for Lisp program
--- 
-2.25.0
-
diff --git a/testing/sbcl/APKBUILD b/testing/sbcl/APKBUILD
index 7f11a0f090..3ea2d3317c 100644
--- a/testing/sbcl/APKBUILD
+++ b/testing/sbcl/APKBUILD
@@ -3,20 +3,17 @@
 # Contributor: Will Sinatra <wpsinatra@gmail.com>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=sbcl
-pkgver=2.0.3
+pkgver=2.0.5
 pkgrel=0
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
-arch="x86_64 armv7" #aarch64 support inbound on 2.0.4
+arch="x86_64 armv7 aarch64"
 license="custom"
 options="!check"
 checkdepends="ed"
 makedepends="ecl ecl-dev gmp-dev gc gc-dev libffi-dev linux-headers paxmark zlib-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.bz2::https://prdownloads.sourceforge.net/sbcl/sbcl-$pkgver-source.tar.bz2
-        0001-Fix-sb-bsd-sockets-on-musl-libc.patch
-        0002-Fix-threads-on-musl-libc.patch
-        0003-Fix-foreign-tests-on-musl-libc.patch
         0004-Only-include-old-memcpy-version-on-glibc.patch
         Fix-ARM-build-using-ECL-host.patch
         march-armv5-removed.patch"
@@ -48,10 +45,7 @@ package() {
                 "$pkgdir"/usr/share/info 2>/dev/null || true
 }
 
-sha512sums="c29c115fff0e118e5c05959dd8d73ae876458daeb5ddde67ce485b10e6d1583b1f8a9597b54b45606696ab1b1eea5392dcb09357c83fce31323f2a5a154f2dd1  sbcl-2.0.3.tar.bz2
-0f5b3cac8fed2bac1bfa25f4116ef62e7226994318aff26a69bae6e29a7952e16fe930f14bba2a41b0e50c4cc3e30ce2a36dd8d0b85e6090d455ec6712f3a10a  0001-Fix-sb-bsd-sockets-on-musl-libc.patch
-36bbe64437763f7963dab7af3bcc26ab92ee10d6b12532be40706ce01a5fe29878d8ef9392037be8f09b357a6527e992d1698ea4cd1048050544b2e653edd5fa  0002-Fix-threads-on-musl-libc.patch
-9a1b20c07a1f43ea60d1bd0f4de2474c38441858a7de7351f046943d022c21803bd5d9eb05b5c684519a76dc623d9893af1967c3a26177e7447e05e30e61b18b  0003-Fix-foreign-tests-on-musl-libc.patch
+sha512sums="0c27e22dd76d157a74ef7e97dcd03030096dde0eb46901ea27acb60faa0ab34881d76a9c6708d963b0e6f62da6331b85b8d3de76fd1fc9163c159e631759f808  sbcl-2.0.5.tar.bz2
 7c7d7b982814435463a7678ff59ab354426bcee62a3b7ba253d8da1391e68c614cd4d90970fbbfd68ea0927c2689b6c16f01b0e0185489329700ce21aaa5a92c  0004-Only-include-old-memcpy-version-on-glibc.patch
 6f49d1f1c6bd4e8d839e6b4ab3bb74cbdcce85ee83a0f1c5efab04d97b613a624f8874dadd7f6d981940ff28c468f00b74a56ff2afc53f41884d753ac7a5028f  Fix-ARM-build-using-ECL-host.patch
 367454a75de122134fdbf1064182a96ee00cf0685db0922134fdbdfc0e0bb2c6a5cfb9878f23409eca48a443e0f19b291f8d380e3475176a4c8cea0c9768c2bd  march-armv5-removed.patch"