You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/12/03 05:29:00 UTC
[buildstream-plugins] branch tristan/remove-extra-configs created (now c06a9d7)
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a change to branch tristan/remove-extra-configs
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
at c06a9d7 cmake, autotools, meson: Remove deprecated variables
This branch includes the following new commits:
new c06a9d7 cmake, autotools, meson: Remove deprecated variables
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream-plugins] 01/01: cmake, autotools, meson: Remove deprecated variables
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/remove-extra-configs
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
commit c06a9d7337b6196b707bbf7677db82b609c14427
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Sat Dec 3 14:27:31 2022 +0900
cmake, autotools, meson: Remove deprecated variables
Fixes #34.
---
src/buildstream_plugins/elements/autotools.yaml | 5 +----
src/buildstream_plugins/elements/cmake.yaml | 5 +----
src/buildstream_plugins/elements/meson.yaml | 5 +----
tests/cachekey/project/elements/autotools1.expected | 2 +-
tests/cachekey/project/elements/meson1.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
6 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/buildstream_plugins/elements/autotools.yaml b/src/buildstream_plugins/elements/autotools.yaml
index 38cb1c4..0e2aa1c 100644
--- a/src/buildstream_plugins/elements/autotools.yaml
+++ b/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: |
diff --git a/src/buildstream_plugins/elements/cmake.yaml b/src/buildstream_plugins/elements/cmake.yaml
index 01ff8e3..8dfab1d 100644
--- a/src/buildstream_plugins/elements/cmake.yaml
+++ b/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: |
diff --git a/src/buildstream_plugins/elements/meson.yaml b/src/buildstream_plugins/elements/meson.yaml
index 8f08e0b..c87fb7d 100644
--- a/src/buildstream_plugins/elements/meson.yaml
+++ b/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}
diff --git a/tests/cachekey/project/elements/autotools1.expected b/tests/cachekey/project/elements/autotools1.expected
index b2b346c..0dc7777 100644
--- a/tests/cachekey/project/elements/autotools1.expected
+++ b/tests/cachekey/project/elements/autotools1.expected
@@ -1 +1 @@
-569d7d8e4792eb6d1f89328c50c42b6316ffdd5387a5f15df6e097515898faa4
\ No newline at end of file
+53651f0c81d32341b4cc46f12fb4a1123f66e2e65111d2176b5c5102e96de2e2
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/meson1.expected b/tests/cachekey/project/elements/meson1.expected
index a43c69a..d966047 100644
--- a/tests/cachekey/project/elements/meson1.expected
+++ b/tests/cachekey/project/elements/meson1.expected
@@ -1 +1 @@
-eb27d2832662f0b5d9fcb4e6304611e85226b282cc8f83ac79bdc56031307758
\ No newline at end of file
+3ebf1011dac6034b710ec85e80da993624c2c33014915cada59d130ced11f47e
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 6b18d77..407d30c 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-7881a8251b8128165d28720f1e5b30e4e914e2711700e4d7231c7ab91f10ba39
\ No newline at end of file
+c32929ce4692a7a87664b3245a7740fc518679979972c2d221c4ee6a802b12c3
\ No newline at end of file