[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
85/92: self: Build gnu/packages/*.go in 26 steps on the Hurd.
From: |
guix-commits |
Subject: |
85/92: self: Build gnu/packages/*.go in 26 steps on the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:47 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 4803c747837db8bc9cb595f4c1c6ab979dd21810
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Jun 22 08:30:25 2023 +0200
self: Build gnu/packages/*.go in 26 steps on the Hurd.
Similar to the Makefile.am change, this breaks-up packages into 26 chunks
when building for the Hurd. Also force garbage collection.
* guix/self.scm (compiled-modules)[process-directory/hurd]: New inner
define.
Use it when building on the Hurd.
---
guix/self.scm | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 81a36e007f..5f7fae6d90 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1210,9 +1211,12 @@ containing MODULE-FILES and possibly other files as
well."
'((guix build compile)
(guix build utils)))
#~(begin
- (use-modules (srfi srfi-26)
+ (use-modules (srfi srfi-1)
+ (srfi srfi-26)
+ (srfi srfi-71)
(ice-9 match)
(ice-9 format)
+ (ice-9 regex)
(ice-9 threads)
(guix build compile)
(guix build utils))
@@ -1251,6 +1255,26 @@ containing MODULE-FILES and possibly other files as
well."
#:report-load report-load
#:report-compilation report-compilation)))
+ (define (process-directory/hurd directory files output)
+ (let* ((chunks (map (compose
+ (cute partition <> files)
+ (lambda (regex)
+ (cute string-match regex <>))
+ (cute string-append "^gnu/packages/" <>)
+ (cute make-string 1 <>)
+ integer->char
+ (cute + (char->integer #\a) <>))
+ (iota 26)))
+ (chunks (filter pair? chunks)))
+ (for-each
+ (lambda (chunck)
+ (compile-files directory #$output chunck
+ #:workers (parallel-job-count)
+ #:report-load report-load
+ #:report-compilation report-compilation)
+ (gc))
+ chunks)))
+
(setvbuf (current-output-port) 'line)
(setvbuf (current-error-port) 'line)
@@ -1277,7 +1301,9 @@ containing MODULE-FILES and possibly other files as well."
(mkdir #$output)
(chdir #+module-tree)
- (process-directory "." '#+module-files #$output)
+ (if (string-ci= "GNU" (vector-ref (uname) 0))
+ (process-directory/hurd "." '#+module-files #$output)
+ (process-directory "." '#+module-files #$output))
(newline))))
(computed-file name build
- 71/92: gnu: doxygen: Fix build for the Hurd., (continued)
- 71/92: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/23
- 70/92: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/06/23
- 73/92: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/23
- 78/92: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/23
- 79/92: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 80/92: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 81/92: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/23
- 82/92: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/23
- 83/92: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/06/23
- 84/92: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/06/23
- 85/92: self: Build gnu/packages/*.go in 26 steps on the Hurd.,
guix-commits <=
- 86/92: gnu: guix: Disable some test on 32bit., guix-commits, 2023/06/23
- 89/92: gnu: guix: Update to 1.4.0-9.cf94c6e337., guix-commits, 2023/06/23
- 92/92: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/23
- 91/92: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/23