summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Cragg <edward.cragg@codethink.co.uk>2015-03-18 15:34:46 (GMT)
committerEd Cragg <edward.cragg@codethink.co.uk>2015-03-20 14:45:52 (GMT)
commit0fdecbd3342899dfa788ea94cb6724db6ffd9aa6 (patch)
tree60dfad435068830ff52ce1e5dde781a249641c2d
parent55ec8895c4488bc4e6fb888725c54f909b6beba7 (diff)
downloaddefinitions-0fdecbd3342899dfa788ea94cb6724db6ffd9aa6.tar.gz
Revert "strata/core.morph: bison doesnt depend on bash"
This reverts commit c5240343053398d288cc500ff54379a3b0de5309. The original clean-up patch breaks the native build phase of cross-bootstrap on tested platforms - armv8l64, armv8b64, and x86_64. In the bootstrap environment, the native build of bison does rely on being run with bash rather than sh. Change-Id: Id8ed8793f8a179615a2f8733e867445cac544043
-rw-r--r--strata/core.morph1
-rw-r--r--strata/core/bison.morph2
2 files changed, 2 insertions, 1 deletions
diff --git a/strata/core.morph b/strata/core.morph
index dce6b0e..cae24f3 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -199,6 +199,7 @@ chunks:
build-depends:
- autoconf-tarball
- automake
+ - bash
- flex
- gettext-tarball
- git
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 5f50fe8..7c7fffd 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,4 +2,4 @@ name: bison
kind: chunk
build-system: autotools
pre-configure-commands:
-- ./bootstrap --skip-po
+- bash bootstrap --skip-po