public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrey Grozin" <grozin@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
Date: Fri, 10 Feb 2023 15:32:07 +0000 (UTC)	[thread overview]
Message-ID: <1676043104.9043fbca6651f389d38e768ab8f4b63df832c8dc.grozin@gentoo> (raw)

commit:     9043fbca6651f389d38e768ab8f4b63df832c8dc
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 15:31:11 2023 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 15:31:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9043fbca

dev-lisp/sbcl: bump to 2.3.1

Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>

 dev-lisp/sbcl/Manifest                           |   2 +
 dev-lisp/sbcl/files/bsd-sockets-test-2.3.1.patch | 410 +++++++++++++++++++++++
 dev-lisp/sbcl/sbcl-2.3.1.ebuild                  | 254 ++++++++++++++
 3 files changed, 666 insertions(+)

diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 56045705a1d0..33cd2afe3a80 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -16,3 +16,5 @@ DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065
 DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400
 DIST sbcl-2.3.0-source.tar.bz2 7332206 BLAKE2B e0111d36c285b5cf3bc492a28d9b1ade794681e530272b924bf2f84cf418d8de1fccf067765ff890aa84483d4730b31c7e2b0633c45132fe97e96e4a82c0efde SHA512 1241dcc41f5119dbca0be7b7c0d926d951e3d8daf2bedf5467dcdffa384719bb635eb9e99b4e4653afb00ebfa27e1777ed24f193ebc6213bc924a102258a61b9
 DIST sbcl-2.3.0-x86-64-linux-binary.tar.bz2 11788515 BLAKE2B 9af0dd28d83dba9983797610bceaf1f88ce796c3ea55cc13b675b217818b2cf7dd231ad4577a7f31be31965b8cce6d4887a3f56f721dd6db51f12f6104ec8252 SHA512 864997a9774760f65a682f12236aba81777ed93ca69707978fb2ebf9fba83589bcd347f625ca886de2edfa4506c0df7d10100f8301c58a4729b59981593f7e96
+DIST sbcl-2.3.1-source.tar.bz2 7334588 BLAKE2B 53f9310799e80f25938f0b0cd3a871f1342681e43c58a5048e6d0b9ca0b2bc4d1aae936d96bdd351bf53de42426932bd62ff32522a8e343ba21db759f30c6fb1 SHA512 2e73217f30852682521f2b361cd70650d60a4328d7ac84f9221dbc0b0a8f0c2bee5917882e8d4af5a2c05c1c2589deba11d0c3cb8634adedde6b60ef15cd5c98
+DIST sbcl-2.3.1-x86-64-linux-binary.tar.bz2 11833188 BLAKE2B 276f3be10b111b7255d3cafb3a8b65af5fd885ae7079a95759a5170a6598094feb80d589559134c46388f31f429ef6e0b4a43477d86635b5a096aeae91018588 SHA512 d9a054c75c5a9e804216408e96daf7fa57bcbfb98dc8736b815fc16dd47cf2bcaf9dd47c8192e454ce6d16995e6bcbdc7e99730ab30c83f8d35bdd8b0bb95d7e

diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-2.3.1.patch b/dev-lisp/sbcl/files/bsd-sockets-test-2.3.1.patch
new file mode 100644
index 000000000000..e4810e991a83
--- /dev/null
+++ b/dev-lisp/sbcl/files/bsd-sockets-test-2.3.1.patch
@@ -0,0 +1,410 @@
+diff -r -U3 sbcl-2.3.1.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-2.3.1/contrib/sb-bsd-sockets/tests.lisp
+--- sbcl-2.3.1.orig/contrib/sb-bsd-sockets/tests.lisp	2023-01-28 18:56:32.000000000 +0700
++++ sbcl-2.3.1/contrib/sb-bsd-sockets/tests.lisp	2023-02-10 21:10:52.358958490 +0700
+@@ -13,16 +13,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"))
+@@ -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)
+ 
+ (eval-when (:compile-toplevel :execute)
+   (when (handler-case (make-instance 'inet-socket
+@@ -104,19 +104,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
+@@ -125,67 +125,67 @@
+     (non-blocking-mode s))
+   t)
+ 
+-#+ipv4-support
+-(test-util:with-test (:name :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))
+-         (failure)
+-         (got-addrinuse))
+-    (format t "~&::: INFO: made sockets~%")
+-    (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) ; should fail
+-                 nil)
+-             (address-in-use-error () (setq got-addrinuse t))
+-             (condition (c) (setq failure c))))
+-      (socket-close s1)
+-      (socket-close s2))
+-    (cond (failure (error "BIND failed with ~A" failure))
+-          ((not got-addrinuse) (error "Expected ADDRESS-IN-USE err")))))
+-
+-(test-util:with-test (:name :inet6-socket-bind)
+-  (let ((notsupp)
+-        (failure)
+-        (got-addrinuse))
+-  (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)))
+-        (format t "~&::: INFO: made sockets~%")
+-        (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) ; should fail
+-                       nil)
+-                   (address-in-use-error () (setq got-addrinuse t))
+-                   (condition (c) (setq failure c)))))
+-          (socket-close s1)
+-          (socket-close s2)))
+-    ((or address-family-not-supported protocol-not-supported-error) ()
+-      (setq notsupp t)))
+-  (cond (notsupp (format t "~&INFO: not supported~%"))
+-        (failure (error "BIND failed with ~A" failure))
+-        ((not got-addrinuse) (error "Expected ADDRESS-IN-USE err")))))
++;#+ipv4-support
++;(test-util:with-test (:name :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))
++;         (failure)
++;         (got-addrinuse))
++;    (format t "~&::: INFO: made sockets~%")
++;    (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) ; should fail
++;                 nil)
++;             (address-in-use-error () (setq got-addrinuse t))
++;             (condition (c) (setq failure c))))
++;      (socket-close s1)
++;      (socket-close s2))
++;    (cond (failure (error "BIND failed with ~A" failure))
++;          ((not got-addrinuse) (error "Expected ADDRESS-IN-USE err")))))
++
++;(test-util:with-test (:name :inet6-socket-bind)
++;  (let ((notsupp)
++;        (failure)
++;        (got-addrinuse))
++;  (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)))
++;        (format t "~&::: INFO: made sockets~%")
++;        (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) ; should fail
++;                       nil)
++;                   (address-in-use-error () (setq got-addrinuse t))
++;                   (condition (c) (setq failure c)))))
++;          (socket-close s1)
++;          (socket-close s2)))
++;    ((or address-family-not-supported protocol-not-supported-error) ()
++;      (setq notsupp t)))
++;  (cond (notsupp (format t "~&INFO: not supported~%"))
++;        (failure (error "BIND failed with ~A" failure))
++;        ((not got-addrinuse) (error "Expected ADDRESS-IN-USE err")))))
+ 
+ #+ipv4-support
+ (deftest simple-sockopt-test
+@@ -253,37 +253,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
+ 
+@@ -428,59 +428,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)
+@@ -543,8 +543,8 @@
+             (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/sbcl-2.3.1.ebuild b/dev-lisp/sbcl/sbcl-2.3.1.ebuild
new file mode 100644
index 000000000000..45438a1be47e
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.3.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2023 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.3.1
+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
+	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"
+
+CDEPEND=">=dev-lisp/asdf-3.3:= \
+	prefix? ( dev-util/patchelf )"
+# bug #843851
+BDEPEND="${CDEPEND}
+		dev-util/strace
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+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}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-2.3.1.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 ; 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() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	# Bug #869434
+	append-cppflags -D_GNU_SOURCE
+
+	# 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
+		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}"
+}


             reply	other threads:[~2023-02-10 15:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 15:32 Andrey Grozin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-07-20 16:00 [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/ Andrey Grozin
2022-11-24 10:40 Andrey Grozin
2022-10-01 10:20 Andrey Grozin
2022-02-18  4:53 Andrey Grozin
2021-04-25 12:32 Sam James
2021-01-28 11:36 Andrey Grozin
2020-04-04 14:18 Andrey Grozin
2019-03-15 15:59 Andrey Grozin
2018-03-11 11:31 José María Alonso
2017-10-01 17:08 José María Alonso
2017-04-05  9:19 José María Alonso
2017-03-02 18:03 Andrey Grozin
2017-03-01 12:57 Mark Wright
2016-12-10 12:14 Andrey Grozin
2015-08-29 11:20 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=1676043104.9043fbca6651f389d38e768ab8f4b63df832c8dc.grozin@gentoo \
    --to=grozin@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