summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-09-05 09:26:23 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-09-18 18:11:18 +0000
commitb8109fcb482a36e7fe55e65bb8f2e912dfe68350 (patch)
treeddc3347d00d2034470fed8155877486f26e64321
parent023bf4b6264451dde5f572bbd32c815c67757c8f (diff)
downloaddefinitions-b8109fcb482a36e7fe55e65bb8f2e912dfe68350.tar.gz
core: Set MAKEFLAGS="-j 1" during libtool preconfigure
I got a seemingly random failure in CI: https://gitlab.com/baserock/definitions/-/jobs/31214873 The log line with the actual error is cut off by BuildStream and I can't reproduce the issue locally, but since it's clearly an intermittent problem I can only put it down to the way BuildStream sets MAKEFLAGS during the configure stage affecting the gnulib bootstrap process (which does run `make` at one point).
-rw-r--r--strata/core.morph2
-rw-r--r--strata/core/libtool.morph10
2 files changed, 11 insertions, 1 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 8c12c42d..f98cd8f4 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -257,10 +257,10 @@ chunks:
- libtool-tarball
- perl
- name: libtool
+ morph: strata/core/libtool.morph
repo: upstream:libtool
ref: f09d00cbcf924c378573163e244fffeb8d28005f
unpetrify-ref: v2.4.6
- build-system: autotools
build-depends:
- autoconf
- automake
diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph
new file mode 100644
index 00000000..fc44e6fd
--- /dev/null
+++ b/strata/core/libtool.morph
@@ -0,0 +1,10 @@
+name: libtool
+kind: chunk
+build-system: autotools
+configure-commands:
+- >-
+ export NOCONFIGURE=1; export MAKEFLAGS="-j 1";
+ ./bootstrap
+- ./configure --prefix="$PREFIX"
+ --sysconfdir=/etc
+ --localstatedir=/var