diff mbox series

[bug#55220,2/4] platform: Add discovery support.

Message ID 20220502111859.13605-2-othacehe@gnu.org
State Accepted
Headers show
Series Add --list-systems and --list-targets options. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Mathieu Othacehe May 2, 2022, 11:18 a.m. UTC 
* gnu/platform.scm (platform-modules, systems, targets): New procedures.
(%platforms): New variable.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/platform.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

Comments

Ludovic Courtès May 6, 2022, 2:41 p.m. UTC | #1 
Mathieu Othacehe <othacehe@gnu.org> skribis:

> * gnu/platform.scm (platform-modules, systems, targets): New procedures.
> (%platforms): New variable.
>
> Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>

[...]

> +(define %platforms
> +  ;; The list of publically-known platforms.
> +  (delay (fold-module-public-variables (lambda (obj result)
> +                                         (if (platform? obj)
> +                                             (cons obj result)
> +                                             result))
> +                                       '()
> +                                       (platform-modules))))

Maybe expose it as a memoizing procedure thunk called ‘platforms’, for
consistency with the names ‘systems’ and ‘targets’.

> +
> +;;;
> +;;; Systems & Targets.
> +;;;
> +
> +(define (systems)
> +  "Return the list of supported systems."
> +  (delete-duplicates
> +   (filter-map platform-system (force %platforms))))
> +
> +(define (targets)
> +  "Return the list of supported targets."
> +  (map platform-target (force %platforms)))

Or ‘supported-systems’ and ‘supported-targets’?

Ludo’.
Mathieu Othacehe May 7, 2022, 3:53 p.m. UTC | #2 
> Maybe expose it as a memoizing procedure thunk called ‘platforms’, for
> consistency with the names ‘systems’ and ‘targets’.

Done.

> Or ‘supported-systems’ and ‘supported-targets’?

That would clash with the supported-systems field of <package>.

But by the way, there's already a %supported-systems in (guix packages)
that I would like to replace by systems. However importing (gnu
platform) from there seems problematic.

Thanks,

Mathieu
diff mbox series

Patch

diff --git a/gnu/platform.scm b/gnu/platform.scm
index bb6519c71a..481467086a 100644
--- a/gnu/platform.scm
+++ b/gnu/platform.scm
@@ -17,22 +17,78 @@ 
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu platform)
+  #:use-module (guix discovery)
   #:use-module (guix records)
+  #:use-module (guix ui)
+  #:use-module (srfi srfi-1)
   #:export (platform
             platform?
             platform-target
             platform-system
-            platform-linux-architecture))
+            platform-linux-architecture
+
+            platform-modules
+            %platforms
+
+            systems
+            targets))
 
 
 ;;;
 ;;; Platform record.
 ;;;
 
-;; Description of a platform supported by the GNU system.
+;; Description of a platform supported by GNU Guix.
+;;
+;; The 'target' field must be a valid GNU triplet as defined here:
+;; https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Specifying-Target-Triplets.html.
+;; It is used for cross-compilation purposes.
+;;
+;; The 'system' field is the name of the corresponding system as defined in
+;; the (gnu packages bootstrap) module.  It can be for instance
+;; "aarch64-linux" or "armhf-linux".  It is used to emulate a different host
+;; architecture, for instance i686-linux on x86_64-linux-gnu, or armhf-linux
+;; on x86_64-linux, using the QEMU binfmt transparent emulation mechanism.
+;;
+;; The 'linux-architecture' is only relevant if the kernel is Linux.  In that
+;; case, it corresponds to the ARCH variable used when building Linux.
 (define-record-type* <platform> platform make-platform
   platform?
   (target             platform-target)               ;"x86_64-linux-gnu"
   (system             platform-system)               ;"x86_64-linux"
-  (linux-architecture platform-linux-architecture    ;"amd64"
+  (linux-architecture platform-linux-architecture    ;"x86"
                       (default #f)))
+
+;;;
+;;; Platforms.
+;;;
+
+(define (platform-modules)
+  "Return the list of platform modules."
+  (all-modules (map (lambda (entry)
+                      `(,entry . "gnu/platforms"))
+                    %load-path)
+               #:warn warn-about-load-error))
+
+(define %platforms
+  ;; The list of publically-known platforms.
+  (delay (fold-module-public-variables (lambda (obj result)
+                                         (if (platform? obj)
+                                             (cons obj result)
+                                             result))
+                                       '()
+                                       (platform-modules))))
+
+
+;;;
+;;; Systems & Targets.
+;;;
+
+(define (systems)
+  "Return the list of supported systems."
+  (delete-duplicates
+   (filter-map platform-system (force %platforms))))
+
+(define (targets)
+  "Return the list of supported targets."
+  (map platform-target (force %platforms)))