ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-systems: cmake: Add support for #:allowed-references.

Browse source 
Also actually honor #:disallowed-references when cross-compiling.

* guix/build-system/cmake.scm (cmake-build): Add #:allowed-references keyword,
and pass it to gexp->derivation.
(cmake-cross-build): Likewise.  Also pass disallowed-references to
gexp->derivation which had apparently been forgotten.

Change-Id: I1e9861295359b090bd5407c5f76afddf890e36bf
This commit is contained in:
Maxim Cournoyer 2024-01-21 21:47:39 -05:00 committed by Ludovic Courtès
parent dbb5650682
commit 8da07d2e9e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
guix/build-system/cmake.scm
View file

@ -116,6 +116,7 @@ (define* (cmake-build name inputs
(imported-modules %cmake-build-system-modules)
(modules '((guix build cmake-build-system)
(guix build utils)))
allowed-references
disallowed-references)
"Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
provides a 'CMakeLists.txt' file as its build system."
@ -158,6 +159,7 @@ (define build
#:target #f
#:graft? #f
#:substitutable? substitutable?
#:allowed-references allowed-references
#:disallowed-references disallowed-references
#:guile-for-build guile)))
@ -193,6 +195,7 @@ (define* (cmake-cross-build name
(imported-modules %cmake-build-system-modules)
(modules '((guix build cmake-build-system)
(guix build utils)))
allowed-references
disallowed-references)
"Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its
@ -250,6 +253,8 @@ (define %outputs
#:target target
#:graft? #f
#:substitutable? substitutable?
#:allowed-references allowed-references
#:disallowed-references disallowed-references
#:guile-for-build guile)))
(define cmake-build-system