commit: 69a5ac8480ce00e1ce545ba4a70e773a205ee325 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> AuthorDate: Fri Feb 18 04:52:02 2022 +0000 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> CommitDate: Fri Feb 18 04:52:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a5ac84
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 <AT> gentoo.org> dev-lisp/sbcl/Manifest | 3 - dev-lisp/sbcl/files/concurrency-test-1.3.15.patch | 17 - .../sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch | 383 --------------------- dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch | 29 -- dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch | 13 - dev-lisp/sbcl/sbcl-1.4.9.ebuild | 239 ------------- 6 files changed, 684 deletions(-) diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index c056c85aeae0..f574bf1933ee 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -9,13 +9,10 @@ DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 BLAKE2B 4036684f398c0766d55a60 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.12-armhf-linux-binary.tar.bz2 9193847 BLAKE2B 27106c0144ee99f534cd0a59cfb331ef8f39dbefdc76e294a8671523b1c05f42353d31b8e74600dd01f85fb5156d39216a877d77aba57a061427ea1dc28a492e SHA512 5bdb4e2b584933e9ee9aaa2ba68328f219f072af802782ee5dedf83baa5c679cd5a1ccbf3458678810ccb8679ffd392d4fba108e86d537e10554c1860bfd4de5 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 -DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d -DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236 DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 DIST sbcl-2.2.0-source.tar.bz2 6697729 BLAKE2B de89a3725ab68e7c189b225ee43bda3f53ca457c7c63a12c593e6f44559833cb1c95bda4e66181429a32cff614177a5650f94b45add5a5013c7a80b43608c04d SHA512 0afd424e6b8dbc574e928fbfb1ce264211b94e5bdef35b131a9f672b5051819d6978ea5338863e1321305dc562d8d81ae33c1e1fffdbaf6a60a3fbef0926e99f DIST sbcl-2.2.0-x86-64-linux-binary.tar.bz2 10178679 BLAKE2B 7a38af9f548807852fc602bb2cb4be3d50ab9fef875919f5c38df6fa9a43e80323cd005064c2e373cbb72d8e7e01a1ee4e0732c3ca9b8ee558e6c2f965d4631f SHA512 a148cf90b2b31ecd49a767468355eca166f428d491588ce5bd577da6efa32e0531b92fba1bfbf034b058a9af8baa45842e41ec24411bd3d5766b9cf20206453b 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> diff --git a/dev-lisp/sbcl/sbcl-1.4.9.ebuild b/dev-lisp/sbcl/sbcl-1.4.9.ebuild deleted file mode 100644 index a206148ab726..000000000000 --- a/dev-lisp/sbcl/sbcl-1.4.9.ebuild +++ /dev/null @@ -1,239 +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.4.3 -BV_AMD64=1.4.8 -BV_PPC=1.2.7 -BV_PPC64LE=1.5.8 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.3.12 -BV_ARM64=1.4.2 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -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 ) - ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-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 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-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 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-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() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.3.15.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - # bug #777582 - eapply "${FILESDIR}"/${PN}-1.4.9-gcc-10.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || 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 - - # 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}" -}
