From 0b0f8d737e9522d8c2c805f09e0658bfd54e662f Mon Sep 17 00:00:00 2001 From: John Turner Date: Fri, 16 Dec 2022 02:20:42 -0500 Subject: [PATCH] dev-lisp/sbcl: (wip) bootstrap with ecls or already installed sbcl Added a system-bootstrap flag that allows building SBCL from source with either ecl or an existing install of sbcl. --- dev-lisp/sbcl/Manifest | 14 + .../sbcl/files/bsd-sockets-test-2.0.5.patch | 385 ++++++++++++++++++ .../sbcl/files/concurrency-test-2.0.1.patch | 12 + dev-lisp/sbcl/files/etags-2.1.0.patch | 10 + dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch | 30 ++ dev-lisp/sbcl/files/verbose-build-2.0.3.patch | 29 ++ dev-lisp/sbcl/metadata.xml | 32 ++ dev-lisp/sbcl/sbcl-2.2.11.ebuild | 288 +++++++++++++ 8 files changed, 800 insertions(+) create mode 100644 dev-lisp/sbcl/Manifest create mode 100644 dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch create mode 100644 dev-lisp/sbcl/files/concurrency-test-2.0.1.patch create mode 100644 dev-lisp/sbcl/files/etags-2.1.0.patch create mode 100644 dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch create mode 100644 dev-lisp/sbcl/files/verbose-build-2.0.3.patch create mode 100644 dev-lisp/sbcl/metadata.xml create mode 100644 dev-lisp/sbcl/sbcl-2.2.11.ebuild diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest new file mode 100644 index 0000000..b35d8fa --- /dev/null +++ b/dev-lisp/sbcl/Manifest @@ -0,0 +1,14 @@ +DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 BLAKE2B 4be6831c196cfef505b411fa9ae0b9586f93309ce97fcd2b964abfb4175f00f7437da7859334973f2441592fc1a13cc5557044737659f5ef13998b593d623cda SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a +DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab +DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 BLAKE2B ca4213ef00447d66406d1c752a1653fd628deba0e112f55a5625dad61da30c0be7c60fe4e84e8dcc9d9946db553ad544dc39b28d62124d8e3d6197943efc944a SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 +DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf08a21603d4f172344c86e650176d238fe73d7756a626b694e2165b9157e53732730861d085902e5cc893b967073168fe3845cd2621668b87 SHA512 8118de56e448bce7a72b832e661eb4e2687eed675f88f766f7043c843a432e35121d9e6f9da8d22ac690c54bda0d55ecb07728748ce2cdd57320f49b4b812b86 +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-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 +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.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 +DIST sbcl-2.2.11-source.tar.bz2 7290281 BLAKE2B 5242127e2e9ee384f96cb4a6a7c3db30a4ef20885f1d28edeb8a73ef46275f19a99a801bd3be9fb424fdfaa4c7c5915061f3d87e043388f0d5b73c53648f53d0 SHA512 5c13d9d1305903d0c99b27485224c97f6e8d118afd24711afc7f80f92884352fff8cb075c36c7b752c79a09136206b6a8bcd7fbf8cbe979bbce777b978a1a594 +DIST sbcl-2.2.11-x86-64-linux-binary.tar.bz2 11651831 BLAKE2B 4907159286054642145e26c9739d2becf6a6e01788ee0a203a6444fbdb2a6ea3f760c22cca373151297a366af3d022daa73bbe0191f28d3dc03544285882b509 SHA512 d5786c3b893dc264c611c19c5bd24e919ed1978746a14c96e2ccf4659953d26b112868342f8a5db2df6bd1c30890ecf77627dbf135416564add94cd904017474 diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch b/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch new file mode 100644 index 0000000..3226e75 --- /dev/null +++ b/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch @@ -0,0 +1,385 @@ +diff -U3 -r sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp +--- sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp 2020-05-31 20:16:48.000000000 +0700 ++++ sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp 2020-06-08 18:15:59.750860802 +0700 +@@ -18,16 +18,16 @@ + (equalp (make-inet-address "242.1.211.3") #(242 1 211 3)) + t) + +-(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 unparse-inet6-address +- (string= (sb-bsd-sockets::unparse-inet6-address +- (make-inet6-address "fe80::abcd:1234")) +- "fe80::abcd:1234") +- t) ++;(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 unparse-inet6-address ++; (string= (sb-bsd-sockets::unparse-inet6-address ++; (make-inet6-address "fe80::abcd:1234")) ++; "fe80::abcd:1234") ++; t) + + (deftest get-protocol-by-name/tcp + (integerp (get-protocol-by-name "tcp")) +@@ -40,15 +40,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) + + (eval-when (:compile-toplevel :execute) + (when (handler-case (make-instance 'inet-socket +@@ -108,19 +108,19 @@ + (:no-error nil)) + t) + +-(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) +- +-(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) ++;(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) ++ ++;(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) +@@ -129,54 +129,54 @@ + (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) +- +-(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) ++ ++;(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) +@@ -244,37 +244,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 + +@@ -390,59 +390,59 @@ + (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 +- (sem (sb-thread:make-semaphore))) +- (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 +- (sb-thread:signal-semaphore sem) +- (read-char stream)) +- (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))) +- (socket-close s) +- (sb-thread:wait-on-semaphore sem) +- (sleep 0.1) +- (sb-thread:interrupt-thread client +- (lambda () (throw 'stop :ok))) +- (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) +- (setf result :timeout)) +- (write-char #\x stream) +- (close stream) +- (socket-close r) +- (sb-thread:join-thread client :timeout 5)))))) +- (server)) +- result) +- :ok) ++;#+(and ipv4-support sb-thread) ++;(deftest interrupt-io ++; (let (result ++; (sem (sb-thread:make-semaphore))) ++; (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 ++; (sb-thread:signal-semaphore sem) ++; (read-char stream)) ++; (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))) ++; (socket-close s) ++; (sb-thread:wait-on-semaphore sem) ++; (sleep 0.1) ++; (sb-thread:interrupt-thread client ++; (lambda () (throw 'stop :ok))) ++; (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) ++; (setf result :timeout)) ++; (write-char #\x stream) ++; (close stream) ++; (socket-close r) ++; (sb-thread:join-thread client :timeout 5)))))) ++; (server)) ++; result) ++; :ok) + + (defmacro with-client-and-server (((socket-class &rest common-initargs) + (listen-socket-var &rest listen-address) +@@ -505,8 +505,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) ++) + + (defun poor-persons-random-address () + (let ((base (expt 36 8))) diff --git a/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch new file mode 100644 index 0000000..e0a36a8 --- /dev/null +++ b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch @@ -0,0 +1,12 @@ +diff -r -U3 sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp +--- sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2020-01-27 04:26:30.000000000 +0700 ++++ sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp 2020-01-30 21:53:57.750913923 +0700 +@@ -88,7 +88,7 @@ + #+sb-thread + (deftest* (frlock.1) + (handler-case +- (sb-ext:with-timeout 40 ++ (sb-ext:with-timeout 240 + (test-frlocks #+win32 :outer-write-pause #+win32 t )) + (sb-ext:timeout (c) + (error "~A" c))) diff --git a/dev-lisp/sbcl/files/etags-2.1.0.patch b/dev-lisp/sbcl/files/etags-2.1.0.patch new file mode 100644 index 0000000..8f14e50 --- /dev/null +++ b/dev-lisp/sbcl/files/etags-2.1.0.patch @@ -0,0 +1,10 @@ +diff -r -U2 sbcl-2.1.0.orig/src/runtime/GNUmakefile sbcl-2.1.0/src/runtime/GNUmakefile +--- sbcl-2.1.0.orig/src/runtime/GNUmakefile 2020-12-29 17:05:25.000000000 +0700 ++++ sbcl-2.1.0/src/runtime/GNUmakefile 2021-01-28 18:02:57.682523052 +0700 +@@ -12,5 +12,5 @@ + .PHONY: all clean TAGS tags targets + +-all: targets tags ++all: targets + TARGET=sbcl + diff --git a/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch new file mode 100644 index 0000000..f88f133 --- /dev/null +++ b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch @@ -0,0 +1,30 @@ +diff -r -U2 sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp +--- sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp 2022-09-29 14:43:33.000000000 +0700 ++++ sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp 2022-10-01 16:32:39.919563905 +0700 +@@ -166,15 +166,15 @@ + #.sb-posix::einval) + +-(deftest rmdir.error.3 +- (handler-case +- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) +- (sb-posix:syscall-error (c) +- (typep +- (sb-posix:syscall-errno c) +- `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir +- #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty +- #+sunos ,sb-posix::einval +- #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) +- t) ++; (deftest rmdir.error.3 ++; (handler-case ++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) ++; (sb-posix:syscall-error (c) ++; (typep ++; (sb-posix:syscall-errno c) ++; `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir ++; #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty ++; #+sunos ,sb-posix::einval ++; #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) ++; t) + + (deftest rmdir.error.4 diff --git a/dev-lisp/sbcl/files/verbose-build-2.0.3.patch b/dev-lisp/sbcl/files/verbose-build-2.0.3.patch new file mode 100644 index 0000000..263436a --- /dev/null +++ b/dev-lisp/sbcl/files/verbose-build-2.0.3.patch @@ -0,0 +1,29 @@ +diff -U3 -r sbcl-2.0.3.orig/make.sh sbcl-2.0.3/make.sh +--- sbcl-2.0.3.orig/make.sh 2020-03-29 03:58:29.000000000 +0700 ++++ sbcl-2.0.3/make.sh 2020-04-04 19:56:16.510279232 +0700 +@@ -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 "$@" --check-host-lisp || exit $? ++sh -x make-config.sh "$@" --check-host-lisp || 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 + + # contrib/Makefile shouldn't be counted in NCONTRIBS. + # "find contrib/* -name Makefile" would still find contrib/./Makefile. diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml new file mode 100644 index 0000000..3f09daa --- /dev/null +++ b/dev-lisp/sbcl/metadata.xml @@ -0,0 +1,32 @@ + + + + + grozin@gentoo.org + Andrey Grozin + + + common-lisp@gentoo.org + Gentoo Common Lisp Project + + Steel Bank Common Lisp is an open source Common + Lisp implementation. It provides an integrated native compiler, + interpreter, and debugger. SBCL is a fork off of the main branch + of CMUCL. SBCL is distinguished from CMUCL by a greater emphasis + on maintainability. In particular, the SBCL system can be built + directly from its source code, so that the output corresponds to + the source code in a controlled, verifiable way, and arbitrary + changes can be made to the system without causing bootstrapping + problems. SBCL also places less emphasis than CMU CL does on new + non-ANSI extensions, or on backward compatibility with old + non-ANSI features. Support for native threading on GNU/Linux is + available for the x86 and amd64 platforms using an NPTL enabled + GLIBC. SBCL 0.8.17 and later support Unicode. + + + Enable disassembly support with dev-libs/capstone + + + sbcl + + diff --git a/dev-lisp/sbcl/sbcl-2.2.11.ebuild b/dev-lisp/sbcl/sbcl-2.2.11.ebuild new file mode 100644 index 0000000..94fbc6f --- /dev/null +++ b/dev-lisp/sbcl/sbcl-2.2.11.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic pax-utils toolchain-funcs + +#same order as http://www.sbcl.org/platform-table.html +BV_X86=1.4.3 +BV_AMD64=2.2.11 +BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 +BV_SPARC=1.0.28 +BV_ALPHA=1.0.28 +BV_ARM=1.4.11 +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="https://www.sbcl.org/ http://sbcl.sourceforge.net/" +SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 + !system-bootstrap? ( + 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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="debug doc source +threads +unicode +zstd system-bootstrap" + +# Restrict system-bootstrap to amd64 platforms for now +REQUIRED_USE="system-bootstrap? ( + amd64 + )" + +CDEPEND=">=dev-lisp/asdf-3.3:= + prefix? ( dev-util/patchelf )" + +# bug #843851 +BDEPEND="${CDEPEND} + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) + system-bootstrap? ( + amd64? ( || ( + >=dev-lisp/ecls-21.2.1_p20221211 + >=dev-lisp/sbcl-${BV_AMD64} + ) ) + )" + +RDEPEND="${CDEPEND} + zstd? ( app-arch/zstd ) + !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 zstd)" ":sb-core-compression" + sbcl_feature "$(usep debug)" ":sb-xref-for-internals" + sed 's/^X//' >> "${CONFIG}" <<-'EOF' + X ) + X list) + EOF + cat "${CONFIG}" +} + +with_clean_environment() { + env --ignore-environment \ + HOME="${T}" \ + PATH="${PATH}" \ + CC="$(tc-getCC)" \ + AS="$(tc-getAS)" \ + LD="$(tc-getLD)" \ + CPPFLAGS="${CPPFLAGS}" \ + CFLAGS="${CFLAGS}" \ + ASFLAGS="${ASFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + GNUMAKE=make \ + TMPDIR="${T}" \ + "$@" +} + +src_unpack() { + unpack ${A} + if ! use system-bootstrap; then + mv sbcl-*-* sbcl-binary || die + fi + cd "${S}" +} + +src_prepare() { + # bug #468482 + eapply "${FILESDIR}"/concurrency-test-2.0.1.patch + # bugs #486552, #527666, #517004 + eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch + # bugs #560276, #561018 + eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + + eapply "${FILESDIR}"/verbose-build-2.0.3.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 + + # set interpreter for Prefix + if use prefix && ! use system-bootstrap; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + + # applying customizations + sbcl_apply_features +} + +src_compile() { + if use system-bootstrap; then + if has_version dev-lisp/sbcl; then + local lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + else + local lisp="ecl --nodebug" + fi + else + local lisp="sh ${WORKDIR}/sbcl-binary/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + fi + # Bug #869434 + append-cppflags -D_GNU_SOURCE + + # clear the environment to get rid of non-ASCII strings, see bug #174702 + # set HOME for paludis + with_clean_environment ./make.sh "${lisp}" || die "make failed" + + # need to set HOME because libpango(used by graphviz) complains about it + if use doc; then + with_clean_environment \ + 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" + with_clean_environment \ + 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 + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done + 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}" +} -- 2.39.5