[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: self: Build gnu/packages/*.go in 26 steps.
From: |
guix-commits |
Subject: |
02/02: self: Build gnu/packages/*.go in 26 steps. |
Date: |
Tue, 22 Aug 2023 15:24:55 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit 5898b2e8a3dbf7797e83b39a2783c5b543015725
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Jun 22 08:30:25 2023 +0200
self: Build gnu/packages/*.go in 26 steps.
Similar to the Makefile.am change, this breaks-up gnu/packages into 26
chunks
when building on 32bit. Also force garbage collection.
* guix/self.scm (compiled-modules)[process-directory]: Split building of
"gnu/packages" into 26 chunks.
---
guix/self.scm | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 81a36e007f..239727dfa8 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))
@@ -1244,12 +1248,27 @@ containing MODULE-FILES and possibly other files as
well."
(force-output))
(define (process-directory directory files output)
- ;; Hide compilation warnings.
- (parameterize ((current-warning-port (%make-void-port "w")))
- (compile-files directory #$output files
- #:workers (parallel-job-count)
- #:report-load report-load
- #:report-compilation report-compilation)))
+ ;; Split gnu/packages in 26 chunks to avoid OOM errors
+ (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)
+ ;; Hide compilation warnings.
+ (parameterize ((current-warning-port (%make-void-port "w")))
+ (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)