guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: sbcl-iolib: Fix build to refer to its subpackages properly.

Browse source 
* gnu/packages/lisp-xyz.scm (sbcl-iolib): Inherit from its subpackages instead
  of the other way around, so that they are automatically referenced in the
  generated .asd.
This commit is contained in:
Pierre Neidhardt 2020-03-07 11:28:32 +01:00
parent 5fb3c00256
commit af5c4efff6
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
gnu/packages/lisp-xyz.scm
View file

@ -5357,10 +5357,10 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
#t))))) #t)))))
(synopsis "CFFI Groveller for IOLib, a Common Lisp I/O library"))) (synopsis "CFFI Groveller for IOLib, a Common Lisp I/O library")))
(define-public sbcl-iolib (define sbcl-iolib+syscalls
(package (package
(inherit sbcl-iolib.asdf) (inherit sbcl-iolib.asdf)
(name "sbcl-iolib") (name "sbcl-iolib+syscalls")
(inputs (inputs
`(("iolib.asdf" ,sbcl-iolib.asdf) `(("iolib.asdf" ,sbcl-iolib.asdf)
("iolib.conf" ,sbcl-iolib.conf) ("iolib.conf" ,sbcl-iolib.conf)
@ -5375,7 +5375,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
`(("fiveam" ,sbcl-fiveam))) `(("fiveam" ,sbcl-fiveam)))
(arguments (arguments
'(#:asd-file "iolib.asd" '(#:asd-file "iolib.asd"
#:asd-system-name "iolib" #:asd-system-name "iolib/syscalls"
#:test-asd-file "iolib.tests.asd" #:test-asd-file "iolib.tests.asd"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -5392,41 +5392,58 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
""))))))) "")))))))
(synopsis "Common Lisp I/O library"))) (synopsis "Common Lisp I/O library")))
(define-public cl-iolib
(sbcl-package->cl-source-package sbcl-iolib))
(define sbcl-iolib+multiplex (define sbcl-iolib+multiplex
(package (package
(inherit sbcl-iolib) (inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+multiplex") (name "sbcl-iolib+multiplex")
(inputs
`(("iolib+syscalls" ,sbcl-iolib+syscalls)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib) (substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/multiplex"))))) ((#:asd-system-name _) "iolib/multiplex")))))
(define sbcl-iolib+syscalls
(package
(inherit sbcl-iolib)
(name "sbcl-iolib+syscalls")
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib)
((#:asd-system-name _) "iolib/syscalls")))))
(define sbcl-iolib+streams (define sbcl-iolib+streams
(package (package
(inherit sbcl-iolib) (inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+streams") (name "sbcl-iolib+streams")
(inputs
`(("iolib+multiplex" ,sbcl-iolib+multiplex)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib) (substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/streams"))))) ((#:asd-system-name _) "iolib/streams")))))
(define sbcl-iolib+sockets (define sbcl-iolib+sockets
(package (package
(inherit sbcl-iolib) (inherit sbcl-iolib+syscalls)
(name "sbcl-iolib+sockets") (name "sbcl-iolib+sockets")
(inputs
`(("iolib+syscalls" ,sbcl-iolib+syscalls)
("iolib+streams" ,sbcl-iolib+streams)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib) (substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib/sockets"))))) ((#:asd-system-name _) "iolib/sockets")))))
(define-public sbcl-iolib
(package
(inherit sbcl-iolib+syscalls)
(name "sbcl-iolib")
(inputs
`(("iolib+multiplex" ,sbcl-iolib+multiplex)
("iolib+streams" ,sbcl-iolib+streams)
("iolib+sockets" ,sbcl-iolib+sockets)
,@(package-inputs sbcl-iolib+syscalls)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-iolib+syscalls)
((#:asd-system-name _) "iolib")))))
(define-public cl-iolib
(sbcl-package->cl-source-package sbcl-iolib))
(define-public sbcl-ieee-floats (define-public sbcl-ieee-floats
(let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d")
(revision "1")) (revision "1"))