cmake, autotools, meson: Remove deprecated variables

src/buildstream_plugins/elements/autotools.yaml

@@ -31,9 +31,6 @@ variables:
   # Element-specific extra arguments to be passed to `configure`.
   conf-local: ''
 
-  # For backwards compatibility only, do not use.
-  conf-extra: ''
-
   conf-cmd: "%{conf-root}/configure"
 
   conf-args: |
@@ -50,7 +47,7 @@ variables:
     --localstatedir=%{localstatedir} \
     --sharedstatedir=%{sharedstatedir} \
     --mandir=%{mandir} \
-    --infodir=%{infodir} %{conf-extra} %{conf-global} %{conf-local}
+    --infodir=%{infodir} %{conf-global} %{conf-local}
 
   configure: |
 

src/buildstream_plugins/elements/cmake.yaml

@@ -22,16 +22,13 @@ variables:
   # Element-specific extra arguments to be passed to `cmake`.
   cmake-local: ''
 
-  # For backwards compatibility only, do not use.
-  cmake-extra: ''
-
   # The cmake generator to use
   generator: Ninja
 
   cmake-args: |
 
     -DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \
-    -DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-extra} %{cmake-global} %{cmake-local}
+    -DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-global} %{cmake-local}
 
   cmake: |
 

src/buildstream_plugins/elements/meson.yaml

@@ -22,9 +22,6 @@ variables:
   # Element-specific extra arguments to be passed to `meson`.
   meson-local: ''
 
-  # For backwards compatibility only, do not use.
-  meson-extra: ''
-
   meson-args: |
 
     --prefix=%{prefix} \
@@ -38,7 +35,7 @@ variables:
     --localstatedir=%{localstatedir} \
     --sharedstatedir=%{sharedstatedir} \
     --mandir=%{mandir} \
-    --infodir=%{infodir} %{meson-extra} %{meson-global} %{meson-local}
+    --infodir=%{infodir} %{meson-global} %{meson-local}
 
   meson: meson setup %{conf-root} %{build-dir} %{meson-args}
 

tests/cachekey/project/elements/autotools1.expected

@@ -1 +1 @@
-569d7d8e4792eb6d1f89328c50c42b6316ffdd5387a5f15df6e097515898faa4
+98ae7c344c01c64d2597338ec632e22a36f1b78ce502a9f3ed668edd0921dcb3

tests/cachekey/project/elements/cmake1.expected

@@ -1 +1 @@
-62b5153b0c2643d3402bc8e6e26b8586a119d321da020470642c215aaeec2b0c
+8f1eecc3592e71c82de005be84701025ae0f104a33f5f49f5b117743e79e4281

tests/cachekey/project/elements/meson1.expected

@@ -1 +1 @@
-eb27d2832662f0b5d9fcb4e6304611e85226b282cc8f83ac79bdc56031307758
+06774620db3137433e1ec5efb5872d6379152e9e4b1c64b7374d940334f9a68a

tests/cachekey/project/target.expected

@@ -1 +1 @@
-7881a8251b8128165d28720f1e5b30e4e914e2711700e4d7231c7ab91f10ba39
+253b12d080d6bedfe2af58b035e02ba5aa4a1d719e54d04071685e18d0fea90a

tox.ini

@@ -57,7 +57,7 @@ setenv =
     py{37,38,39,310}: XDG_CACHE_HOME = {envtmpdir}/cache
     py{37,38,39,310}: XDG_CONFIG_HOME = {envtmpdir}/config
     py{37,38,39,310}: XDG_DATA_HOME = {envtmpdir}/share
-    !master: BST_VERSION = 1.95.1
+    !master: BST_VERSION = 1.95.5
     master: BST_VERSION = master
 
 whitelist_externals =