summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2015-05-18 16:43:54 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-06-02 15:28:59 (GMT)
commit7c2bfac98e93e42ffcb23e0d43aee8f3d2c01c69 (patch)
tree0cfb23cf63c8ced5cb93d2e4740216eb95a24afe
parentc6abc426b5857f9b1edd9c72e3094c1e2df8a7bf (diff)
downloaddefinitions-7c2bfac98e93e42ffcb23e0d43aee8f3d2c01c69.tar.gz
Fix bison dependencies so that it builds without git and bash
Change-Id: Idd1a0c155f2872c2b4aba64fa388e505e04fe7ab
-rw-r--r--strata/core.morph5
-rw-r--r--strata/core/bison.morph3
2 files changed, 5 insertions, 3 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 6aa73f7..74ca0e6 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -200,6 +200,9 @@ chunks:
build-depends:
- autoconf-tarball
- automake
+# Note: bison's version number must be set in bison's chunk morph,
+# so if you update bison be sure to also update the version number
+# in strata/core/bison.morph
- name: bison
morph: strata/core/bison.morph
repo: upstream:bison
@@ -208,10 +211,8 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - bash
- flex
- gettext-tarball
- - git
- help2man
- mini-utils
- name: gperf
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 7c7fffd..352f5fc 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,4 +2,5 @@ name: bison
kind: chunk
build-system: autotools
pre-configure-commands:
-- bash bootstrap --skip-po
+- echo "3.0.2" > .tarball-version
+- sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib