TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build-system/asdf: Add support for component-less systems.

Browse source 
* guix/build/lisp-utils.scm (make-asd-file): Ensure lib directory exists and
check if prebuilt bundle system was generated.
(generate-system-definition): Add :class and :components only if prebuilt
system was generated.
This commit is contained in:
Pierre Neidhardt 2020-06-18 16:41:08 +02:00
parent 04dd80181f
commit 5a08660ecb
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
guix/build/lisp-utils.scm
View file

@ -186,13 +186,17 @@ (define (compiled-system system)
(_ system)))) (_ system))))
(define* (generate-system-definition system (define* (generate-system-definition system
#:key version dependencies) #:key version dependencies component?)
`(asdf:defsystem `(asdf:defsystem
,(normalize-string system) ,(normalize-string system)
:class asdf/bundle:prebuilt-system ,@(if component?
'(:class asdf/bundle:prebuilt-system)
'())
:version ,version :version ,version
:depends-on ,dependencies :depends-on ,dependencies
:components ((:compiled-file ,(compiled-system system))) ,@(if component?
`(:components ((:compiled-file ,(compiled-system system))))
'())
,@(if (string=? "ecl" (%lisp-type)) ,@(if (string=? "ecl" (%lisp-type))
`(:lib ,(string-append system ".a")) `(:lib ,(string-append system ".a"))
'()))) '())))
@ -311,14 +315,20 @@ (define registry
lisp-input-map) lisp-input-map)
(map dependency-name dependencies))) (map dependency-name dependencies)))
;; Ensure directory exists, which might not be the case for an .asd without components.
(mkdir-p (dirname asd-file))
(call-with-output-file asd-file (call-with-output-file asd-file
(lambda (port) (lambda (port)
(display (display
(replace-escaped-macros (replace-escaped-macros
(format #f "~y~%~y~%" (format #f "~y~%~y~%"
(generate-system-definition system (generate-system-definition
#:version version system
#:dependencies dependencies) #:version version
#:dependencies dependencies
;; Some .asd don't have components, and thus they don't generate any .fasl.
#:component? (pair?
(find-files (dirname asd-file) "--system\\.fasl$")))
(generate-dependency-links registry system))) (generate-dependency-links registry system)))
port)))) port))))