summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Bridon <bochecha@daitauha.fr>2017-11-11 08:43:20 +0800
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2017-11-11 09:09:37 +0000
commitbe08caa06d6b8ba780aaaaadc56437f10418f39c (patch)
treeb089ad386b4919663253c89197c42d993a5972c9
parent90850f2bdadfb582556f5783c9f47fda46e57bfb (diff)
downloadbuildstream-be08caa06d6b8ba780aaaaadc56437f10418f39c.tar.gz
autotools: Always run the autogen step
BuildStream made the choice to unconditionally run the autogen step for autotools elements, even when building from tarballs. However, due to how the conditionals for what to do in that step were set up, some tarballs would fall through the crack and effectively skip that step. For example the Python tarballs and VCS checkouts both: * do not have an autogen/autogen.sh script * do not have a bootstrap/bootstrap.sh script * do have a configure script The conditionals we had before this change would not do anything for a project like that, and the first thing to actually be run would be the configure script. With this change, `autoreconf` gets run whether the configure script exists or not, ensuring we always effectively do the autogen step. More details on the mailing-list: https://mail.gnome.org/archives/buildstream-list/2017-November/msg00015.html
-rw-r--r--buildstream/plugins/elements/autotools.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/plugins/elements/autotools.yaml b/buildstream/plugins/elements/autotools.yaml
index 318d4d73c..1d67c58b0 100644
--- a/buildstream/plugins/elements/autotools.yaml
+++ b/buildstream/plugins/elements/autotools.yaml
@@ -8,7 +8,7 @@ variables:
elif [ -e autogen.sh ]; then ./autogen.sh;
elif [ -e bootstrap ]; then ./bootstrap;
elif [ -e bootstrap.sh ]; then ./bootstrap.sh;
- elif [ ! -e ./configure ]; then autoreconf -ivf;
+ else autoreconf -ivf;
fi
conf-cmd: ./configure