summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-05-16 22:31:06 +0200
committerVladimír Čunát <v@cunat.cz>2022-05-16 22:35:09 +0200
commit27edeca7927eb2247d7385fccb3f0fd7787471e6 (patch)
treea49eefb971e2b182f30c535f6466e692eaece96b
parenta518a5057cb98fe5fcd360bf0fa9ee6d0b89e5dd (diff)
downloadadwaita-icon-theme-27edeca7927eb2247d7385fccb3f0fd7787471e6.tar.gz
reduce build parallelism
The nested for-loops spawned child processes in an unbounded fashion, so let's wait at the end of each inner loop as a compromise. On my Linux 16-threaded machine the whole build process gets slowed down by this from 43 seconds to 64; sounds OK to me. This should avoid repeated failures we now keep seeing elsewhere > install-sh: fork: retry: Resource temporarily unavailable The parallelism was introduced in commit a2f3046d (MR !39).
-rw-r--r--src/fullcolor/Makefile.am1
-rw-r--r--src/symbolic/Makefile.am4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
index b7d0808bd..4fe02f39c 100644
--- a/src/fullcolor/Makefile.am
+++ b/src/fullcolor/Makefile.am
@@ -11,6 +11,7 @@ install-data-local:
$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
done; \
+ wait; \
done; \
wait
diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
index e1f88183b..f1a46c3c0 100644
--- a/src/symbolic/Makefile.am
+++ b/src/symbolic/Makefile.am
@@ -36,6 +36,7 @@ install-data-local:
$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
done; \
+ wait; \
done; \
for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
context="`dirname $$file`"; \
@@ -44,7 +45,8 @@ install-data-local:
for size in $(symbolic_encode_sizes); do \
$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
- done \
+ done; \
+ wait; \
done; \
wait