summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-04 04:06:57 +0000
committerSam James <sam@gentoo.org>2022-03-04 23:58:28 +0000
commitef728db1b1a5dc37165a9caf616896a754fa769a (patch)
treeb8a5ba7f46bd92da4d4c0d33a5cae868ad6c2176 /dev-lisp/sbcl/files
parentdev-lisp/ecls: drop 16.1.3-r1, 20.4.24-r1, 21.2.1-r3 (diff)
downloadgentoo-ef728db1b1a5dc37165a9caf616896a754fa769a.tar.gz
gentoo-ef728db1b1a5dc37165a9caf616896a754fa769a.tar.bz2
gentoo-ef728db1b1a5dc37165a9caf616896a754fa769a.zip
dev-lisp/sbcl: drop 1.3.11
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lisp/sbcl/files')
-rw-r--r--dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch350
-rw-r--r--dev-lisp/sbcl/files/concurrency-test-1.2.6.patch24
-rw-r--r--dev-lisp/sbcl/files/gentoo-fix_install_man.patch12
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch22
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch12
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch25
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.3.11-config.patch16
7 files changed, 0 insertions, 461 deletions
diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
deleted file mode 100644
index 88f6fa588cee..000000000000
--- a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp
---- sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp 2015-04-27 20:56:47.000000000 +0600
-+++ sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp 2015-04-28 22:27:32.588146072 +0600
-@@ -36,13 +36,13 @@
- ;;; 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)
-
- (deftest make-inet-socket.smoke
-@@ -92,19 +92,19 @@
- 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))
-- (address-family-not-supported () 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))
-- (address-family-not-supported () 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))
-+; (address-family-not-supported () 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))
-+; (address-family-not-supported () t))
-+; t)
-
- (deftest* (non-block-socket)
-@@ -114,52 +114,52 @@
- t)
-
--(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)))
-- (address-family-not-supported () t))
-- t)
-+;(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)))
-+; (address-family-not-supported () t))
-+; t)
-
- (deftest* (simple-sockopt-test)
-@@ -228,35 +228,35 @@
- ;;; 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)
-
-
-@@ -373,58 +373,58 @@
- len address port (subseq buf 0 (min 10 len)))))))
-
--#+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)
-+;#+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 ((server-socket-var client-socket-var) &body body)
-@@ -485,4 +485,5 @@
- client server (unsigned-byte 8) ,direction)))))
-
-- (define-shutdown-tests :output)
-- (define-shutdown-tests :io))
-+; (define-shutdown-tests :output)
-+; (define-shutdown-tests :io))
-+)
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
deleted file mode 100644
index b85fc168ed0e..000000000000
--- a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp
---- a/contrib/sb-concurrency/tests/test-frlock.lisp 2014-11-29 19:56:58.000000000 +0100
-+++ b/contrib/sb-concurrency/tests/test-frlock.lisp 2014-12-16 23:52:18.569947139 +0100
-@@ -22,9 +22,9 @@
- #+openbsd 0.01
- #-openbsd 0.0001)
-
--(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
-+(defun test-frlocks (&key (reader-count 50) (read-count 500000)
- (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))
- (a 0)
-@@ -87,7 +87,7 @@
- #+sb-thread
- (deftest* (frlock.1 :fails-on :win32)
- (handler-case
-- (sb-ext:with-timeout 60 (test-frlocks))
-+ (sb-ext:with-timeout 240 (test-frlocks))
- (sb-ext:timeout (c)
- (error "~A" c)))
- nil
diff --git a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch b/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
deleted file mode 100644
index 87a5f43c0c13..000000000000
--- a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/install.sh b/install.sh
-index 1400791..ac149c1 100644
---- a/install.sh
-+++ b/install.sh
-@@ -106,6 +106,7 @@ echo "Documentation:"
-
- # man
- cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
-+cp doc/sbcl-asdf-install.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl-asdf-install.1"
-
- # info
- for info in doc/manual/*.info
diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
deleted file mode 100644
index bf03ada518fe..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sbcl-1.1.17-orig/src/runtime/Config.x86-linux 2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-linux 2014-04-28 15:34:59.822482441 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic -m32
-+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
- OS_LIBS = -ldl
-
- ifdef LISP_FEATURE_LARGEFILE
---- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux 2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux 2014-04-28 15:35:22.364623003 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LINKFLAGS += -Wl,--export-dynamic -nopie
- OS_LIBS = -ldl
-
- ifdef LISP_FEATURE_LARGEFILE
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
deleted file mode 100644
index 850fd5d9dba7..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos 2015-04-27 20:56:50.000000000 +0600
-+++ sbcl-1.2.11/src/runtime/Config.x86-sunos 2015-04-28 22:38:01.569103626 +0600
-@@ -12,6 +12,6 @@
- CC=gcc
- CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--NM = nm -xgp
--GREP = ggrep
-+NM = nm -t x -p
-+GREP = grep
-
- ASSEM_SRC = x86-assem.S ldso-stubs.S
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
deleted file mode 100644
index ade4f0868c67..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh
---- sbcl-1.2.13.orig/make.sh 2015-06-29 01:24:03.000000000 +0600
-+++ sbcl-1.2.13/make.sh 2015-06-29 15:53:04.430927942 +0600
-@@ -25,5 +25,5 @@
- # 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
-@@ -70,9 +70,9 @@
- # and the make-target-*.sh scripts will take care of transferring the
- # necessary files.
--time sh make-host-1.sh
--time sh make-target-1.sh
--time sh make-host-2.sh
--time sh make-target-2.sh
--time sh make-target-contrib.sh
-+time sh -x make-host-1.sh
-+time sh -x make-target-1.sh
-+time sh -x make-host-2.sh
-+time sh -x make-target-2.sh
-+time sh -x make-target-contrib.sh
-
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
deleted file mode 100644
index e23f1e6d9bcb..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux
---- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux 2016-10-30 23:28:43.000000000 +0700
-+++ sbcl-1.3.11/src/runtime/Config.x86-64-linux 2016-11-16 23:27:37.248815622 +0700
-@@ -58,12 +58,4 @@
- endif
-
--# The following works for Ubuntu 16.10. There must be a better way to
--# do this across various flavors of linux.
--ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
--CFLAGS += -fno-pie
--LINKFLAGS += -no-pie
--LDFLAGS += -no-pie
--endif
--
- # Nothing to do for after-grovel-headers.
- .PHONY: after-grovel-headers