guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: maint: Remove unsupported cross-compilation jobs from 'release-ma


From: guix-commits
Subject: 01/03: maint: Remove unsupported cross-compilation jobs from 'release-manifest.scm'.
Date: Sat, 4 Apr 2020 12:52:53 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit d8c8bfcc1f7c2e8226abebc6227261c8617f90d0
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sat Apr 4 17:35:02 2020 +0200

    maint: Remove unsupported cross-compilation jobs from 
'release-manifest.scm'.
    
    * etc/release-manifest.scm (%packages-to-cross-build-for-mingw): New
    variable.
    (%cross-manifest): Use it.  Remove "riscv64-linux-gnu" from %CROSS-TARGETS.
---
 etc/release-manifest.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index 67b92c3..327d3e4 100644
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -23,6 +23,7 @@
              (guix packages)
              (guix profiles)
              ((gnu ci) #:select (%cross-targets))
+             (guix utils)
              (srfi srfi-1)
              (srfi srfi-26))
 
@@ -67,6 +68,10 @@ TARGET."
                "gawk" "gettext" "gzip" "xz"
                "hello" "guile@2.2" "zlib"))))
 
+(define %packages-to-cross-build-for-mingw
+  ;; Many things don't build for MinGW.  Restrict to what's known to work.
+  (map specification->package '("hello")))
+
 (define %cross-bootstrap-targets
   ;; Cross-compilation triplets for which 'bootstrap-tarballs' must be
   ;; buildable.
@@ -91,8 +96,12 @@ TARGET."
    (append-map (lambda (target)
                  (map (cut package->manifest-entry* <> "x86_64-linux"
                            #:target target)
-                      %packages-to-cross-build))
-               %cross-targets)))
+                      (if (target-mingw? target)
+                          %packages-to-cross-build-for-mingw
+                          %packages-to-cross-build)))
+               ;; XXX: Important bits like libsigsegv and libffi don't support
+               ;; RISCV at the moment, so don't require RISCV support.
+               (delete "riscv64-linux-gnu" %cross-targets))))
 
 (define %cross-bootstrap-manifest
   (manifest



reply via email to

[Prev in Thread] Current Thread [Next in Thread]