Will Salmon pushed to branch willsalmon/outOfSourecBuild at BuildStream / buildstream
Commits:
-
70ae87fa
by William Salmon at 2018-09-04T14:01:39Z
2 changed files:
Changes:
| ... | ... | @@ -52,6 +52,12 @@ variables: |
| 52 | 52 |
# normally staged
|
| 53 | 53 |
build-root: /buildstream/%{project-name}/%{element-name}
|
| 54 | 54 |
|
| 55 |
+ # now that we have build-root we can define some more helpful
|
|
| 56 |
+ # vars for build elements.
|
|
| 57 |
+ source-directory: .
|
|
| 58 |
+ source-subdir: .
|
|
| 59 |
+ conf-root: "%{build-root}/%{source-directory}/%{source-subdir}/"
|
|
| 60 |
+ |
|
| 55 | 61 |
# Indicates the build installation directory in the sandbox
|
| 56 | 62 |
install-root: /buildstream-install
|
| 57 | 63 |
|
| ... | ... | @@ -6,11 +6,11 @@ variables: |
| 6 | 6 |
export NOCONFIGURE=1;
|
| 7 | 7 |
|
| 8 | 8 |
if [ -x %{conf-cmd} ]; then true;
|
| 9 |
- elif [ -x %{build-root}/%{source-directory}/%{source-subdir}/autogen ]; then %{build-root}/%{source-directory}/%{source-subdir}/./autogen;
|
|
| 10 |
- elif [ -x %{build-root}/%{source-directory}/%{source-subdir}/autogen.sh ]; then %{build-root}/%{source-directory}/%{source-subdir}/./autogen.sh;
|
|
| 11 |
- elif [ -x %{build-root}/%{source-directory}/%{source-subdir}/bootstrap ]; then %{build-root}/%{source-directory}/%{source-subdir}/./bootstrap;
|
|
| 12 |
- elif [ -x %{build-root}/%{source-directory}/%{source-subdir}/bootstrap.sh ]; then %{build-root}/%{source-directory}/%{source-subdir}/./bootstrap.sh;
|
|
| 13 |
- else autoreconf -ivf %{build-root}/%{source-directory}/%{source-subdir};
|
|
| 9 |
+ elif [ -x %{conf-root}/autogen ]; then %{conf-root}/./autogen;
|
|
| 10 |
+ elif [ -x %{conf-root}/autogen.sh ]; then %{conf-root}/./autogen.sh;
|
|
| 11 |
+ elif [ -x %{conf-root}/bootstrap ]; then %{conf-root}/./bootstrap;
|
|
| 12 |
+ elif [ -x %{conf-root}/bootstrap.sh ]; then %{conf-root}/./bootstrap.sh;
|
|
| 13 |
+ else autoreconf -ivf %{conf-root};
|
|
| 14 | 14 |
fi
|
| 15 | 15 |
|
| 16 | 16 |
# Project-wide extra arguments to be passed to `configure`
|
| ... | ... | @@ -22,9 +22,8 @@ variables: |
| 22 | 22 |
# For backwards compatibility only, do not use.
|
| 23 | 23 |
conf-extra: ''
|
| 24 | 24 |
|
| 25 |
- conf-cmd: |
|
|
| 26 |
- |
|
| 27 |
- %{build-root}/%{source-directory}/%{source-subdir}/./configure
|
|
| 25 |
+ conf-cmd: "%{conf-root}./configure"
|
|
| 26 |
+
|
|
| 28 | 27 |
conf-args: |
|
| 29 | 28 |
|
| 30 | 29 |
--prefix=%{prefix} \
|