~ruther/guix-local

8da07d2e9ee9e1601890030a559691204f393606 — Maxim Cournoyer 2 years ago dbb5650
build-systems: cmake: Add support for #:allowed-references.

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
1 files changed, 5 insertions(+), 0 deletions(-)

M guix/build-system/cmake.scm
M guix/build-system/cmake.scm => guix/build-system/cmake.scm +5 -0
@@ 116,6 116,7 @@
                      (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 @@ provides a 'CMakeLists.txt' file as its build system."
                      #:target #f
                      #:graft? #f
                      #:substitutable? substitutable?
                      #:allowed-references allowed-references
                      #:disallowed-references disallowed-references
                      #:guile-for-build guile)))



@@ 193,6 195,7 @@ provides a 'CMakeLists.txt' file as its build system."
                            (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 @@ build system."
                      #:target target
                      #:graft? #f
                      #:substitutable? substitutable?
                      #:allowed-references allowed-references
                      #:disallowed-references disallowed-references
                      #:guile-for-build guile)))

(define cmake-build-system