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/08/23 07:14:09 UTC
[buildstream-plugins] branch master updated: Revert "Enable setting build-dir"
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
The following commit(s) were added to refs/heads/master by this push:
new c241812 Revert "Enable setting build-dir"
new 19a2e61 Merge pull request #29 from nanonyme/revert-build-dir
c241812 is described below
commit c241812f1ff19c1554cd931bbc15b185b5845561
Author: Seppo Yli-Olli <se...@gmail.com>
AuthorDate: Sun Aug 21 23:04:50 2022 +0300
Revert "Enable setting build-dir"
This reverts commit 6c17a7a0f3c1f49c725413d34b0d5cfe83b46ae5.
It is not possible for freedesktop-sdk to use autotools.yml
without breaking API.
---
src/buildstream_plugins/elements/autotools.py | 8 --------
src/buildstream_plugins/elements/autotools.yaml | 6 +-----
tests/cachekey/project/elements/autotools1.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/buildstream_plugins/elements/autotools.py b/src/buildstream_plugins/elements/autotools.py
index f291bb7..5d29870 100644
--- a/src/buildstream_plugins/elements/autotools.py
+++ b/src/buildstream_plugins/elements/autotools.py
@@ -51,14 +51,6 @@ an example of that:
conf-global: |
--disable-gtk-doc --disable-static
-By default build-dir is not used. To improve probability build does not
-tamper with sources, you can set build-dir like
-
-.. code:: yaml
-
- variables:
- build-dir: _builddir
-
Here is the default configuration for the ``autotools`` element in full:
.. literalinclude:: ../../../src/buildstream_plugins/elements/autotools.yaml
diff --git a/src/buildstream_plugins/elements/autotools.yaml b/src/buildstream_plugins/elements/autotools.yaml
index c8ba33b..159a07f 100644
--- a/src/buildstream_plugins/elements/autotools.yaml
+++ b/src/buildstream_plugins/elements/autotools.yaml
@@ -1,7 +1,6 @@
# Autotools default configurations
variables:
- build-dir: "."
autogen: |
export NOCONFIGURE=1;
@@ -45,8 +44,7 @@ variables:
%{conf-cmd} %{conf-args}
- make-args: >-
- -C "%{build-dir}"
+ make-args: ""
make-install-args: >-
%{make-args}
DESTDIR="%{install-root}"
@@ -100,8 +98,6 @@ config:
- |
%{autogen}
- |
- mkdir -p "%{build-dir}"
- cd "%{build-dir}"
%{configure}
# Commands for building the software
diff --git a/tests/cachekey/project/elements/autotools1.expected b/tests/cachekey/project/elements/autotools1.expected
index 37031e1..b2b346c 100644
--- a/tests/cachekey/project/elements/autotools1.expected
+++ b/tests/cachekey/project/elements/autotools1.expected
@@ -1 +1 @@
-184b5a595a9c7a56d7e58d3268de441b25ef4d02c46a0e2fd389238bc57aa467
\ No newline at end of file
+569d7d8e4792eb6d1f89328c50c42b6316ffdd5387a5f15df6e097515898faa4
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 0bd64a4..1fcf4ef 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-e93e7c247744177a6c603f9cb3cd1b02a477d706c29d5a56461a8e58c8bea552
\ No newline at end of file
+33d7f831583b2f8ebff9ad0c99520e38ce5d822f1d2e50fbb93e177ebbbd55e8
\ No newline at end of file