Similar to the Makefile.am change, this breaks-up packages into 26 chunks
when building on 32bit. Also force garbage collection.
* guix/self.scm (compiled-modules)[process-directory/32bit]: New inner define.
Use it when building on a "i586" or "i686" cpu.
---
guix/self.scm | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 81a36e007f..474715fe7a 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 <l...@gnu.org>
;;; Copyright © 2020 Martin Becze <mjbe...@riseup.net>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1210,9 +1211,12 @@ (define* (compiled-modules name module-tree module-files
'((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 @@ (define* (compiled-modules name module-tree module-files
#:report-load report-load
#:report-compilation report-compilation)))
+ (define (process-directory/32bit 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,10 @@ (define* (compiled-modules name module-tree module-files
(mkdir #$output)
(chdir #+module-tree)
- (process-directory "." '#+module-files #$output)
+ (match (string-split %host-type #\-)
+ (((or "i586" "i686") rest ...)
+ (process-directory/32bit "." '#+module-files #$output))
+ (_ (process-directory "." '#+module-files #$output)))
(newline))))
(computed-file name build
--
2.41.0
