buildstream/plugins/elements: Add *-global and *-local configuration variables

This will allow to define:
- global configuration parameters that will be used to all the elements
  using that build system
- local configuration parameters that will override the global ones

Left *-extra for compatibility

3 files changed, 9 insertions, 3 deletions

diff --git a/buildstream/plugins/elements/autotools.yaml b/buildstream/plugins/elements/autotools.yaml
index 1d67c58b0..6a1664883 100644
--- a/buildstream/plugins/elements/autotools.yaml
+++ b/buildstream/plugins/elements/autotools.yaml
@@ -13,6 +13,8 @@ variables:
 
   conf-cmd: ./configure
   conf-extra: ''
+  conf-global: ''
+  conf-local: ''
   conf-args: |
 
     --prefix=%{prefix} \
@@ -27,7 +29,7 @@ variables:
     --localstatedir=%{localstatedir} \
     --sharedstatedir=%{sharedstatedir} \
     --mandir=%{mandir} \
-    --infodir=%{infodir} %{conf-extra}
+    --infodir=%{infodir} %{conf-extra} %{conf-global} %{conf-local}
 
   configure: |
 
diff --git a/buildstream/plugins/elements/cmake.yaml b/buildstream/plugins/elements/cmake.yaml
index 5ed933ce6..2ff0db16d 100644
--- a/buildstream/plugins/elements/cmake.yaml
+++ b/buildstream/plugins/elements/cmake.yaml
@@ -4,10 +4,12 @@ variables:
 
   # FIXME: Get a more complete cmake invocation
   cmake-extra: ''
+  cmake-global: ''
+  cmake-local: ''
   cmake-args: |
 
     -DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \
-    -DCMAKE_INSTALL_LIBDIR=%{lib} %{cmake-extra}
+    -DCMAKE_INSTALL_LIBDIR=%{lib} %{cmake-extra} %{cmake-global} %{cmake-local}
 
   cmake: |
 
diff --git a/buildstream/plugins/elements/meson.yaml b/buildstream/plugins/elements/meson.yaml
index ee42fe6c0..57d09dd1c 100644
--- a/buildstream/plugins/elements/meson.yaml
+++ b/buildstream/plugins/elements/meson.yaml
@@ -5,6 +5,8 @@ variables:
   build-dir: _builddir
 
   meson-extra: ''
+  meson-global: ''
+  meson-local: ''
   meson-args: |
 
     --prefix=%{prefix} \
@@ -18,7 +20,7 @@ variables:
     --localstatedir=%{localstatedir} \
     --sharedstatedir=%{sharedstatedir} \
     --mandir=%{mandir} \
-    --infodir=%{infodir} %{meson-extra}
+    --infodir=%{infodir} %{meson-extra} %{meson-global} %{meson-local}
 
   meson: meson %{build-dir} %{meson-args}