From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/files/, dev-lisp/sbcl/
Date: Fri, 4 Mar 2022 23:58:55 +0000 (UTC) [thread overview]
Message-ID: <1646438308.ef728db1b1a5dc37165a9caf616896a754fa769a.sam@gentoo> (raw)
commit: ef728db1b1a5dc37165a9caf616896a754fa769a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 04:06:57 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 23:58:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef728db1
dev-lisp/sbcl: drop 1.3.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lisp/sbcl/Manifest | 4 -
dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch | 350 ---------------------
dev-lisp/sbcl/files/concurrency-test-1.2.6.patch | 24 --
dev-lisp/sbcl/files/gentoo-fix_install_man.patch | 12 -
...7-gentoo-fix_nopie_for_hardened_toolchain.patch | 22 --
dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch | 12 -
.../sbcl/files/sbcl-1.2.13-verbose-build.patch | 25 --
dev-lisp/sbcl/files/sbcl-1.3.11-config.patch | 16 -
dev-lisp/sbcl/sbcl-1.3.11.ebuild | 230 --------------
9 files changed, 695 deletions(-)
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index f574bf1933ee..dbf9c6c281c7 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -5,11 +5,7 @@ DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf0
DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215
DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790
DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1
-DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 BLAKE2B 4036684f398c0766d55a6089fb67ae23520fc949b39525b2ac005f2665cdee8c0901a638e5dfc8e78e5f80963331a5fe2ddd4b0108ddaea063fabfd1d5829f72 SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c
DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1
-DIST sbcl-1.3.11-source.tar.bz2 5790557 BLAKE2B d6b493d880ab2481f18381475165a3eed585fa46e626eb1e762cced29a6a7315be638df6f44ffdc694d8fb55509f912267a7dbe8892b6672eb56e839f55908ff SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82
-DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 BLAKE2B f1f6ebbec168a47d7405c15c63a70f10afad2d271d17dfa461f94bd8b1a1c21506a3a9c1d7ffe2501cc70419406e0d73b53a34ff9ff003e4791170101b7b1293 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056
-DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 BLAKE2B 0dbfe39803d6e3955124fa1a619da7b6d4ec9e7d6eb78e868508c61bf478a980cb15ba427ef0b38d0f051ce38b881020534c0d37bfbcd81a8d763654283669ec SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd
DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb
DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
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
diff --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild
deleted file mode 100644
index 8e3fed30c22a..000000000000
--- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.2.7
-BV_AMD64=1.3.11
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.3.9
-BV_ARM64=1.3.11
-BV_PPC_MACOS=1.0.47
-BV_X64_MACOS=1.2.11
-BV_SPARC_SOLARIS=1.0.23
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
- x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
- amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
- ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
- sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
- alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
- arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
- ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
- x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
- sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
- x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
- x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="-* amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.1:="
-DEPEND="${CDEPEND}
- doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
- !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
- use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
- echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
- sed 's/^X//' > "${CONFIG}" <<-'EOF'
- (lambda (list)
- X (flet ((enable (x) (pushnew x list))
- X (disable (x) (setf list (remove x list))))
- EOF
- if use x86 || use amd64; then
- sbcl_feature "$(usep threads)" ":sb-thread"
- fi
- sbcl_feature "true" ":sb-ldb"
- sbcl_feature "false" ":sb-test"
- sbcl_feature "$(usep unicode)" ":sb-unicode"
- sbcl_feature "$(usep zlib)" ":sb-core-compression"
- sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
- sed 's/^X//' >> "${CONFIG}" <<-'EOF'
- X )
- X list)
- EOF
- cat "${CONFIG}"
-}
-
-src_unpack() {
- unpack ${A}
- mv sbcl-*-* sbcl-binary || die
- cd "${S}"
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/gentoo-fix_install_man.patch
- # bug #468482
- eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
- # bugs #486552, #527666, #517004
- eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
- # bugs #560276, #561018
- eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
- # bug #599902
- eapply "${FILESDIR}"/${PN}-1.3.11-config.patch
-
- eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
- eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
-
- # To make the hardened compiler NOT compile with -fPIE -pie
- if gcc-specs-pie ; then
- einfo "Disabling PIE..."
- eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
- fi
-
- eapply_user
-
- # bug #526194
- sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
- -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
- -i src/runtime/GNUmakefile || die
-
- sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
- -i make-config.sh || die
-
- cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-
- use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
- # Some shells(such as dash) don't have "time" as builtin
- # and we don't want to DEPEND on sys-process/time
- sed "s,^time ,," -i make.sh || die
- sed "s,/lib,/$(get_libdir),g" -i install.sh || die
- # #define SBCL_HOME ...
- sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
- # change location of /etc/sbclrc ...
- sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
- find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
- # customizing SBCL version as per
- # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
- echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
- # applying customizations
- sbcl_apply_features
-}
-
-src_compile() {
- local bindir="${WORKDIR}"/sbcl-binary
-
- strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-
- # clear the environment to get rid of non-ASCII strings, see bug 174702
- # set HOME for paludis
- env - HOME="${T}" PATH="${PATH}" \
- CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
- CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
- GNUMAKE=make ./make.sh \
- "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
- || die "make failed"
-
- # need to set HOME because libpango(used by graphviz) complains about it
- if use doc; then
- env - HOME="${T}" PATH="${PATH}" \
- CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
- ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
- make -C doc/manual info html || die "Cannot build manual"
- env - HOME="${T}" PATH="${PATH}" \
- CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
- ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
- make -C doc/internals info html || die "Cannot build internal docs"
- fi
-}
-
-src_test() {
- ewarn "Unfortunately, it is known that some tests fail eg."
- ewarn "run-program.impure.lisp. This is an issue of the upstream's"
- ewarn "development and not of Gentoo's side. Please, before filing"
- ewarn "any bug(s) search for older submissions. Thank you."
- time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
- # install system-wide initfile
- dodir /etc/
- sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
- ;;; The following is required if you want source location functions to
- ;;; work in SLIME, for example.
- X
- (setf (logical-pathname-translations "SYS")
- X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
- X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
- X
- ;;; Setup ASDF2
- (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
- EOF
-
- # Install documentation
- unset SBCL_HOME
- INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
- sh install.sh || die "install.sh failed"
-
- # bug #517008
- pax-mark -mr "${D}"/usr/bin/sbcl
-
- # rm empty directories lest paludis complain about this
- find "${ED}" -empty -type d -exec rmdir -v {} +
-
- if use doc; then
- dodoc -r doc/internals/sbcl-internals
-
- doinfo doc/manual/*.info*
- doinfo doc/internals/sbcl-internals.info
-
- docinto internals-notes
- dodoc doc/internals-notes/*
- else
- rm -Rv "${ED}/usr/share/doc/${PF}" || die
- fi
-
- # install the SBCL source
- if use source; then
- ./clean.sh
- cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
- fi
-
- # necessary for running newly-saved images
- echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
- echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
- doenvd "${ENVD}"
-}
next reply other threads:[~2022-03-04 23:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 23:58 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-03 15:38 [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/files/, dev-lisp/sbcl/ Andrey Grozin
2023-08-06 11:15 Andrey Grozin
2023-07-23 9:03 Andrey Grozin
2020-06-08 14:05 Andrey Grozin
2020-01-30 15:39 Andrey Grozin
2019-09-24 10:32 Andrey Grozin
2019-06-01 11:19 Andrey Grozin
2019-01-03 15:44 Andrey Grozin
2017-07-02 16:21 José María Alonso
2017-02-09 15:01 José María Alonso
2017-02-05 15:59 Andrey Grozin
2016-12-10 12:14 Andrey Grozin
2016-11-16 17:38 Andrey Grozin
2016-03-19 23:45 Ian Delaney
2015-09-22 4:54 Andrey Grozin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1646438308.ef728db1b1a5dc37165a9caf616896a754fa769a.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox