[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build: Build gnu/packages/*.go in four steps.
From: |
guix-commits |
Subject: |
02/02: build: Build gnu/packages/*.go in four steps. |
Date: |
Thu, 15 Jun 2023 08:21:47 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit af2c0c9970469852e78c260e94b3f8c98d959578
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed May 24 15:46:44 2023 +0200
build: Build gnu/packages/*.go in four steps.
This allows guix build --target=i586-pc-gnu from an x86 host.
This is a followup to 1aa7ee52c6c520c2dbbdb06f1381466e9fd96294.
* Makefile.am (MODULES_PACKAGES3, MODULES_PACKAGE4): New variables.
---
Makefile.am | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ab901df757..39a7c5a989 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -770,15 +770,26 @@ endef
# in <https://issues.guix.gnu.org/48963>. Each 'eval' call below creates a
# 'make-*-go' phony target that builds the corresponding subset.
-first_half := \
+first_quart := \
gnu/packages/a% gnu/packages/b% gnu/packages/c% gnu/packages/d% \
- gnu/packages/e% gnu/packages/f% gnu/packages/g% gnu/packages/h% \
- gnu/packages/i% gnu/packages/j% gnu/packages/k% gnu/packages/l%
+ gnu/packages/e% gnu/packages/f%
+
+second_quart :=
\
+ gnu/packages/g% gnu/packages/h% gnu/packages/i% gnu/packages/j% \
+ gnu/packages/k% gnu/packages/l%
+
+third_quart := \
+ gnu/packages/m% gnu/packages/n% gnu/packages/o% gnu/packages/p% \
+ gnu/packages/q% gnu/packages/r% gnu/packages/s%
MODULES_CORE := guix.scm $(filter-out guix/scripts/%,$(filter
guix/%,$(MODULES)))
-MODULES_PACKAGES1 := $(filter $(first_half),$(MODULES))
-MODULES_PACKAGES2 := $(filter-out $(first_half),$(filter
gnu/packages/%,$(MODULES)))
-MODULES_PACKAGES := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2)
+MODULES_PACKAGES1 := $(filter $(first_quart),$(MODULES))
+MODULES_PACKAGES2 := $(filter $(second_quart),$(MODULES))
+MODULES_PACKAGES3 := $(filter $(third_quart),$(MODULES))
+MODULES_PACKAGES4 := $(filter-out $(first_quart)$(second_quart)$(third_quart),
\
+ $(filter gnu/packages/%,$(MODULES)))
+MODULES_PACKAGES := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2) \
+ $(MODULES_PACKAGES3) $(MODULES_PACKAGES4)
MODULES_SYSTEM := gnu.scm $(filter-out gnu/packages/%,$(filter
gnu/%,$(MODULES)))
MODULES_CLI := $(filter guix/scripts/%,$(MODULES))
MODULES_PO := guix/build/po.scm