[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/10: build-systems: cmake: Add support for #:allowed-references.
From: |
guix-commits |
Subject: |
08/10: build-systems: cmake: Add support for #:allowed-references. |
Date: |
Mon, 22 Jan 2024 00:24:01 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 9077def8bbd8b7c1b055bcdbe72d30029427432a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 21 21:47:39 2024 -0500
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
---
guix/build-system/cmake.scm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 2bcc8ac046..0b8a651ee0 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -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
- branch core-updates updated (552ebc47af -> 7c60d1e14f), guix-commits, 2024/01/22
- 04/10: gnu: sphinx: Use 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 06/10: guix: build-system: qt: Support #:disallowed-references., guix-commits, 2024/01/22
- 08/10: build-systems: cmake: Add support for #:allowed-references.,
guix-commits <=
- 09/10: gnu: inkscape/stable: Build stable variant without imagemagick support., guix-commits, 2024/01/22
- 10/10: gnu: hwdata: Update to 0.374., guix-commits, 2024/01/22
- 02/10: build-system: python: Add allowed/disallowed keyword arguments., guix-commits, 2024/01/22
- 01/10: gnu: Use 'gtk-doc/stable' in native-inputs instead of 'gtk-doc'., guix-commits, 2024/01/22
- 05/10: gnu: wpa-supplicant-gui: Use 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 07/10: gnu: bandage: Do not yet use the 'imagemagick/stable' variant., guix-commits, 2024/01/22
- 03/10: build-system: pyproject: Add allowed/disallowed keyword arguments., guix-commits, 2024/01/22