[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/65: build: Build gnu/packages/*.go in five steps.
From: |
guix-commits |
Subject: |
55/65: build: Build gnu/packages/*.go in five steps. |
Date: |
Fri, 14 Jul 2023 10:06:07 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit aa5681e84374fef41cdeaf1e0b88911bc28c271c
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed May 24 15:46:44 2023 +0200
build: Build gnu/packages/*.go in five steps.
This breaks-up packages into five chunks of ~150,000 lines, allowing guix
build --target=i586-pc-gnu from an x86 host.
This is a followup to 1aa7ee52c6c520c2dbbdb06f1381466e9fd96294.
* Makefile.am (first_half): Rename to...
(first_quart): ...this, and also split into...
(second_quart): ...this.
(third_quart, MODULES_PACKAGES3, MODULES_PACKAGE4): New variables.
(make-packages3-go, make-packages4-go): New targets.
(make-packages-go): Add them.
---
Makefile.am | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 54 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a386e6033c..abe97db46a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -772,19 +772,45 @@ 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 := \
- 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%
+first_fifth := \
+ gnu/packages/a% gnu/packages/b% gnu/packages/c%
+
+second_fifth :=
\
+ gnu/packages/d% gnu/packages/e% gnu/packages/f%
+
+third_fifth := \
+ gnu/packages/g% gnu/packages/h% gnu/packages/i%
+
+fourth_fifth :=
\
+ gnu/packages/j% gnu/packages/k% gnu/packages/l% gnu/packages/m% \
+ gnu/packages/n% gnu/packages/o%
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_fifth),$(MODULES))
+MODULES_PACKAGES2 := $(filter $(second_fifth),$(MODULES))
+MODULES_PACKAGES3 := $(filter $(third_fifth),$(MODULES))
+MODULES_PACKAGES4 := $(filter $(fourth_fifth),$(MODULES))
+MODULES_PACKAGES5 := $(filter-out $(first_fifth) $(second_fifth) \
+ $(third_fifth) $(fourth_fifth), \
+ $(filter gnu/packages/%,$(MODULES)))
+MODULES_PACKAGES := $(MODULES_PACKAGES1) $(MODULES_PACKAGES2) \
+ $(MODULES_PACKAGES3) $(MODULES_PACKAGES4) \
+ $(MODULES_PACKAGES5)
MODULES_SYSTEM := gnu.scm $(filter-out gnu/packages/%,$(filter
gnu/%,$(MODULES)))
MODULES_CLI := $(filter guix/scripts/%,$(MODULES))
MODULES_PO := guix/build/po.scm
+print-p1:
+ @echo $(MODULES_PACKAGES1)
+print-p2:
+ @echo $(MODULES_PACKAGES2)
+print-p3:
+ @echo $(MODULES_PACKAGES3)
+print-p4:
+ @echo $(MODULES_PACKAGES4)
+print-p5:
+ @echo $(MODULES_PACKAGES5)
+
$(eval $(call guile-compilation-rule,make-core-go, \
$(MODULES_CORE) guix/config.scm $(dist_noinst_DATA), \
0))
@@ -800,7 +826,27 @@ $(eval $(call guile-compilation-rule,make-packages2-go,
\
$(words $(MODULES_CORE) $(MODULES_PACKAGES1))))
.PHONY: make-packages2-go
-make-packages-go: make-packages1-go make-packages2-go
+$(eval $(call guile-compilation-rule,make-packages3-go,
\
+ $(MODULES_PACKAGES3) make-core-go make-packages1-go make-packages2-go,
\
+ $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2))))
+.PHONY: make-packages3-go
+
+$(eval $(call guile-compilation-rule,make-packages4-go,
\
+ $(MODULES_PACKAGES4) make-core-go make-packages1-go make-packages2-go
\
+ make-packages3-go, \
+ $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2) \
+ $(MODULES_PACKAGES3))))
+.PHONY: make-packages4-go
+
+$(eval $(call guile-compilation-rule,make-packages5-go,
\
+ $(MODULES_PACKAGES5) make-core-go make-packages1-go make-packages2-go
\
+ make-packages3-go make-packages4-go, \
+ $(words $(MODULES_CORE) $(MODULES_PACKAGES1) $(MODULES_PACKAGES2) \
+ $(MODULES_PACKAGES3) $(MODULES_PACKAGES4))))
+.PHONY: make-packages5-go
+
+make-packages-go: make-packages1-go make-packages2-go \
+ make-packages3-go make-packages4-go make-packages5-go
.PHONY: make-packages-go
$(eval $(call guile-compilation-rule,make-system-go, \
- 23/65: gnu: c-ares: Skip failing tests on the Hurd., (continued)
- 23/65: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 24/65: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 27/65: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 25/65: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/14
- 34/65: gnu: cairo: Support building for the Hurd., guix-commits, 2023/07/14
- 35/65: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/14
- 36/65: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/14
- 39/65: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 42/65: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 51/65: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 55/65: build: Build gnu/packages/*.go in five steps.,
guix-commits <=
- 60/65: gnu: guix: Update to 1.4.0-9.5165f041af., guix-commits, 2023/07/14
- 64/65: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/14
- 21/65: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 30/65: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14
- 38/65: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 41/65: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/14
- 44/65: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/14
- 45/65: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 43/65: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 54/65: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/14