summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2022-02-18 11:52:02 +0700
committerAndrey Grozin <grozin@gentoo.org>2022-02-18 11:52:48 +0700
commit69a5ac8480ce00e1ce545ba4a70e773a205ee325 (patch)
tree3677dbb4e78ec56b2d67c1330613da68a6c5b2f6 /dev-lisp/sbcl/files
parentnet-fs/samba: Stabilize 4.15.4-r1 arm, #832458 (diff)
downloadgentoo-69a5ac8480ce00e1ce545ba4a70e773a205ee325.tar.gz
gentoo-69a5ac8480ce00e1ce545ba4a70e773a205ee325.tar.bz2
gentoo-69a5ac8480ce00e1ce545ba4a70e773a205ee325.zip
dev-lisp/sbcl: remove 1.4.9
Bug: https://bugs.gentoo.org/832532 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrey Grozin <grozin@gentoo.org>
Diffstat (limited to 'dev-lisp/sbcl/files')
-rw-r--r--dev-lisp/sbcl/files/concurrency-test-1.3.15.patch17
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch383
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch29
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch13
4 files changed, 0 insertions, 442 deletions
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
deleted file mode 100644
index 53b5bea06bc1..000000000000
--- a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp
---- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2017-02-28 20:51:29.000000000 +0100
-+++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp 2017-03-02 18:15:41.225284441 +0100
-@@ -25,5 +25,5 @@
- (defun test-frlocks (&key (reader-count 100) (read-count 1000000)
- (outer-read-pause 0) (inner-read-pause 0)
-- (writer-count 10) (write-count (/ 1 *minimum-sleep*))
-+ (writer-count 10) (write-count 5000)
- (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
- (let ((rw (make-frlock))
-@@ -88,5 +88,5 @@
- (deftest* (frlock.1)
- (handler-case
-- (sb-ext:with-timeout 10
-+ (sb-ext:with-timeout 240
- (test-frlocks #+win32 :outer-write-pause #+win32 t ))
- (sb-ext:timeout (c)
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
deleted file mode 100644
index d51bdd5c507c..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
---- a/contrib/sb-bsd-sockets/tests.lisp 2017-09-30 18:30:58.000000000 +0200
-+++ b/contrib/sb-bsd-sockets/tests.lisp 2017-10-01 18:45:57.132900158 +0200
-@@ -18,11 +18,11 @@
- (equalp (make-inet-address "242.1.211.3") #(242 1 211 3))
- t)
-
--#-win32
--(deftest make-inet6-address.1
-- (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
-- #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
-- t)
-+;#-win32
-+;(deftest make-inet6-address.1
-+; (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
-+; #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
-+; t)
-
- (deftest get-protocol-by-name/tcp
- (integerp (get-protocol-by-name "tcp"))
-@@ -35,15 +35,15 @@
- ;;; See https://bugs.launchpad.net/sbcl/+bug/659857
- ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
- ;;; for unknown protocols...
--#-(and freebsd sb-thread)
--#-(and dragonfly sb-thread)
--(deftest get-protocol-by-name/error
-- (handler-case (get-protocol-by-name "nonexistent-protocol")
-- (unknown-protocol ()
-- t)
-- (:no-error ()
-- nil))
-- t)
-+;#-(and freebsd sb-thread)
-+;#-(and dragonfly sb-thread)
-+;(deftest get-protocol-by-name/error
-+; (handler-case (get-protocol-by-name "nonexistent-protocol")
-+; (unknown-protocol ()
-+; t)
-+; (:no-error ()
-+; nil))
-+; t)
-
- (when (handler-case (make-instance 'inet-socket
- :type :stream
-@@ -102,21 +102,21 @@
- (:no-error nil))
- t)
-
--#-win32
--(deftest make-inet6-socket.smoke
-- (handler-case
-- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
-- (> (socket-file-descriptor s) 1))
-- ((or address-family-not-supported protocol-not-supported-error) () t))
-- t)
--
--#-win32
--(deftest make-inet6-socket.keyword
-- (handler-case
-- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
-- (> (socket-file-descriptor s) 1))
-- ((or address-family-not-supported protocol-not-supported-error) () t))
-- t)
-+;#-win32
-+;(deftest make-inet6-socket.smoke
-+; (handler-case
-+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
-+; (> (socket-file-descriptor s) 1))
-+; ((or address-family-not-supported protocol-not-supported-error) () t))
-+; t)
-+
-+;#-win32
-+;(deftest make-inet6-socket.keyword
-+; (handler-case
-+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
-+; (> (socket-file-descriptor s) 1))
-+; ((or address-family-not-supported protocol-not-supported-error) () t))
-+; t)
-
- #+ipv4-support
- (deftest* (non-block-socket)
-@@ -125,55 +125,55 @@
- (non-blocking-mode s))
- t)
-
--#+ipv4-support
--(deftest inet-socket-bind
-- (let* ((tcp (get-protocol-by-name "tcp"))
-- (address (make-inet-address "127.0.0.1"))
-- (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
-- (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
-- (unwind-protect
-- ;; Given the functions we've got so far, if you can think of a
-- ;; better way to make sure the bind succeeded than trying it
-- ;; twice, let me know
-- (progn
-- (socket-bind s1 address 0)
-- (handler-case
-- (let ((port (nth-value 1 (socket-name s1))))
-- (socket-bind s2 address port)
-- nil)
-- (address-in-use-error () t)))
-- (socket-close s1)
-- (socket-close s2)))
-- t)
--
--#-win32
--(deftest inet6-socket-bind
-- (handler-case
-- (let* ((tcp (get-protocol-by-name "tcp"))
-- (address (make-inet6-address "::1"))
-- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
-- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
-- (unwind-protect
-- ;; Given the functions we've got so far, if you can think of a
-- ;; better way to make sure the bind succeeded than trying it
-- ;; twice, let me know
-- (handler-case
-- (socket-bind s1 address 0)
-- (socket-error ()
-- ;; This may mean no IPv6 support, can't fail a test
-- ;; because of that (address-family-not-supported doesn't catch that)
-- t)
-- (:no-error (x)
-- (declare (ignore x))
-- (handler-case
-- (let ((port (nth-value 1 (socket-name s1))))
-- (socket-bind s2 address port)
-- nil)
-- (address-in-use-error () t))))
-- (socket-close s1)
-- (socket-close s2)))
-- ((or address-family-not-supported protocol-not-supported-error) () t))
-- t)
-+;#+ipv4-support
-+;(deftest inet-socket-bind
-+; (let* ((tcp (get-protocol-by-name "tcp"))
-+; (address (make-inet-address "127.0.0.1"))
-+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
-+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
-+; (unwind-protect
-+; ;; Given the functions we've got so far, if you can think of a
-+; ;; better way to make sure the bind succeeded than trying it
-+; ;; twice, let me know
-+; (progn
-+; (socket-bind s1 address 0)
-+; (handler-case
-+; (let ((port (nth-value 1 (socket-name s1))))
-+; (socket-bind s2 address port)
-+; nil)
-+; (address-in-use-error () t)))
-+; (socket-close s1)
-+; (socket-close s2)))
-+; t)
-+
-+;#-win32
-+;(deftest inet6-socket-bind
-+; (handler-case
-+; (let* ((tcp (get-protocol-by-name "tcp"))
-+; (address (make-inet6-address "::1"))
-+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
-+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
-+; (unwind-protect
-+; ;; Given the functions we've got so far, if you can think of a
-+; ;; better way to make sure the bind succeeded than trying it
-+; ;; twice, let me know
-+; (handler-case
-+; (socket-bind s1 address 0)
-+; (socket-error ()
-+; ;; This may mean no IPv6 support, can't fail a test
-+; ;; because of that (address-family-not-supported doesn't catch that)
-+; t)
-+; (:no-error (x)
-+; (declare (ignore x))
-+; (handler-case
-+; (let ((port (nth-value 1 (socket-name s1))))
-+; (socket-bind s2 address port)
-+; nil)
-+; (address-in-use-error () t))))
-+; (socket-close s1)
-+; (socket-close s2)))
-+; ((or address-family-not-supported protocol-not-supported-error) () t))
-+; t)
-
- #+ipv4-support
- (deftest* (simple-sockopt-test)
-@@ -241,37 +241,37 @@
- ;;; to look at /etc/syslog.conf or local equivalent to find out where
- ;;; the message ended up
-
--#-win32
--(deftest simple-local-client
-- (progn
-- ;; SunOS (Solaris) and Darwin systems don't have a socket at
-- ;; /dev/log. We might also be building in a chroot or
-- ;; something, so don't fail this test just because the file is
-- ;; unavailable, or if it's a symlink to some weird character
-- ;; device.
-- (when (block nil
-- (handler-bind ((sb-posix:syscall-error
-- (lambda (e)
-- (declare (ignore e))
-- (return nil))))
-- (sb-posix:s-issock
-- (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-- (let ((s (make-instance 'local-socket :type :datagram)))
-- (format t "Connecting ~A... " s)
-- (finish-output)
-- (handler-case
-- (socket-connect s "/dev/log")
-- (sb-bsd-sockets::socket-error ()
-- (setq s (make-instance 'local-socket :type :stream))
-- (format t "failed~%Retrying with ~A... " s)
-- (finish-output)
-- (socket-connect s "/dev/log")))
-- (format t "ok.~%")
-- (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-- (format stream
-- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
-- t)
-- t)
-+;#-win32
-+;(deftest simple-local-client
-+; (progn
-+; ;; SunOS (Solaris) and Darwin systems don't have a socket at
-+; ;; /dev/log. We might also be building in a chroot or
-+; ;; something, so don't fail this test just because the file is
-+; ;; unavailable, or if it's a symlink to some weird character
-+; ;; device.
-+; (when (block nil
-+; (handler-bind ((sb-posix:syscall-error
-+; (lambda (e)
-+; (declare (ignore e))
-+; (return nil))))
-+; (sb-posix:s-issock
-+; (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-+; (let ((s (make-instance 'local-socket :type :datagram)))
-+; (format t "Connecting ~A... " s)
-+; (finish-output)
-+; (handler-case
-+; (socket-connect s "/dev/log")
-+; (sb-bsd-sockets::socket-error ()
-+; (setq s (make-instance 'local-socket :type :stream))
-+; (format t "failed~%Retrying with ~A... " s)
-+; (finish-output)
-+; (socket-connect s "/dev/log")))
-+; (format t "ok.~%")
-+; (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-+; (format stream
-+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
-+; t)
-+; t)
-
- ;;; these require that the internet (or bits of it, at least) is available
-
-@@ -387,60 +387,60 @@
- (format t "Received ~A bytes from ~A:~A - ~A ~%"
- len address port (subseq buf 0 (min 10 len)))))))
-
--#+(and ipv4-support sb-thread)
--(deftest interrupt-io
-- (let (result)
-- (labels
-- ((client (port)
-- (setf result
-- (let ((s (make-instance 'inet-socket
-- :type :stream
-- :protocol :tcp)))
-- (socket-connect s #(127 0 0 1) port)
-- (let ((stream (socket-make-stream s
-- :input t
-- :output t
-- :buffering :none)))
-- (handler-case
-- (prog1
-- (catch 'stop
-- (progn
-- (read-char stream)
-- (sleep 0.1)
-- (sleep 0.1)
-- (sleep 0.1)))
-- (close stream))
-- (error (c)
-- c))))))
-- (server ()
-- (let ((s (make-instance 'inet-socket
-- :type :stream
-- :protocol :tcp)))
-- (setf (sockopt-reuse-address s) t)
-- (socket-bind s (make-inet-address "127.0.0.1") 0)
-- (socket-listen s 5)
-- (multiple-value-bind (* port)
-- (socket-name s)
-- (let* ((client (sb-thread:make-thread
-- (lambda () (client port))))
-- (r (socket-accept s))
-- (stream (socket-make-stream r
-- :input t
-- :output t
-- :buffering :none))
-- (ok :ok))
-- (socket-close s)
-- (sleep 5)
-- (sb-thread:interrupt-thread client
-- (lambda () (throw 'stop ok)))
-- (sleep 5)
-- (setf ok :not-ok)
-- (write-char #\x stream)
-- (close stream)
-- (socket-close r))))))
-- (server))
-- result)
-- :ok)
-+;#+(and ipv4-support sb-thread)
-+;(deftest interrupt-io
-+; (let (result)
-+; (labels
-+; ((client (port)
-+; (setf result
-+; (let ((s (make-instance 'inet-socket
-+; :type :stream
-+; :protocol :tcp)))
-+; (socket-connect s #(127 0 0 1) port)
-+; (let ((stream (socket-make-stream s
-+; :input t
-+; :output t
-+; :buffering :none)))
-+; (handler-case
-+; (prog1
-+; (catch 'stop
-+; (progn
-+; (read-char stream)
-+; (sleep 0.1)
-+; (sleep 0.1)
-+; (sleep 0.1)))
-+; (close stream))
-+; (error (c)
-+; c))))))
-+; (server ()
-+; (let ((s (make-instance 'inet-socket
-+; :type :stream
-+; :protocol :tcp)))
-+; (setf (sockopt-reuse-address s) t)
-+; (socket-bind s (make-inet-address "127.0.0.1") 0)
-+; (socket-listen s 5)
-+; (multiple-value-bind (* port)
-+; (socket-name s)
-+; (let* ((client (sb-thread:make-thread
-+; (lambda () (client port))))
-+; (r (socket-accept s))
-+; (stream (socket-make-stream r
-+; :input t
-+; :output t
-+; :buffering :none))
-+; (ok :ok))
-+; (socket-close s)
-+; (sleep 5)
-+; (sb-thread:interrupt-thread client
-+; (lambda () (throw 'stop ok)))
-+; (sleep 5)
-+; (setf ok :not-ok)
-+; (write-char #\x stream)
-+; (close stream)
-+; (socket-close r))))))
-+; (server))
-+; result)
-+; :ok)
-
- (defmacro with-client-and-server (((socket-class &rest common-initargs)
- (listen-socket-var &rest listen-address)
-@@ -503,8 +503,9 @@
- (define-shutdown-test ,(make-name 'shutdown.client.ub8)
- client server (unsigned-byte 8) ,direction)))))
-
-- (define-shutdown-tests :output)
-- (define-shutdown-tests :io))
-+; (define-shutdown-tests :output)
-+; (define-shutdown-tests :io)
-+)
-
- #+linux
- (deftest abstract.smoke
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
deleted file mode 100644
index 27ad3b0758d4..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar a/make.sh b/make.sh
---- a/make.sh 2017-09-30 18:30:58.000000000 +0200
-+++ b/make.sh 2017-10-01 18:08:26.742909789 +0200
-@@ -24,7 +24,7 @@
- # thing" when run on the target machine, with the minor caveat that
- # any --xc-host parameter should be suitable for the host machine
- # instead of the target.
--sh make-config.sh "$@" || exit $?
-+sh -x make-config.sh "$@" || exit $?
-
- . output/prefix.def
- . output/build-config
-@@ -76,11 +76,11 @@
- $@
- fi
- }
--maybetime sh make-host-1.sh
--maybetime sh make-target-1.sh
--maybetime sh make-host-2.sh
--maybetime sh make-target-2.sh
--maybetime sh make-target-contrib.sh
-+maybetime sh -x make-host-1.sh
-+maybetime sh -x make-target-1.sh
-+maybetime sh -x make-host-2.sh
-+maybetime sh -x make-target-2.sh
-+maybetime sh -x make-target-contrib.sh
-
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
- NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch b/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch
deleted file mode 100644
index 216422e9a60b..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/777582
-https://src.fedoraproject.org/rpms/sbcl/blob/rawhide/f/sbcl-1.4.14-gcc10.patch
---- a/src/runtime/linux-os.c
-+++ b/src/runtime/linux-os.c
-@@ -64,7 +64,7 @@ int personality (unsigned long);
- #include <sys/personality.h>
- #endif
-
--size_t os_vm_page_size;
-+//size_t os_vm_page_size;
-
- #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_FUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
- #include <sys/syscall.h>