diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-09-22 12:56:26 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-10 15:55:25 +0000 |
| commit | 4d296778c123125f279691993a86160e90fa6097 (patch) | |
| tree | 4d1127a880ba96486cb02a79bd4d6ec17286d964 /strata/webtools.morph | |
| parent | 7d65bfe4e33198d88dc3e1b11f78e498fc1f1521 (diff) | |
| download | definitions-4d296778c123125f279691993a86160e90fa6097.tar.gz | |
Split PCRE out into its own stratum
We need PCRE in multiple places, so rather than having multiple
definitions, and potentially differing versions, let's use the same one
from its own stratum.
The need to add the stratum entry into the systems is annoying, and
could probably do with a way of specifying that a stratum includes
another, rather than just depends on it.
Also, it seems a bit weird to have a stratum with only one chunk in it,
but I can't think of a better way.
Diffstat (limited to 'strata/webtools.morph')
| -rw-r--r-- | strata/webtools.morph | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/strata/webtools.morph b/strata/webtools.morph index da5e3338..fd893ae6 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -3,6 +3,7 @@ kind: stratum description: pip, node and other fun things build-depends: - morph: strata/tools.morph +- morph: strata/pcre-utils.morph chunks: - name: icu morph: strata/webtools/icu.morph @@ -26,15 +27,9 @@ chunks: ref: d4b691b743a91500cf49119d28a805db8313f129 unpetrify-ref: master build-depends: [] -- name: pcre - repo: upstream:pcre - ref: 2720152c58e13e7cc7403642ec33127101b9971b - unpetrify-ref: baserock/morph - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 - build-depends: - - pcre + build-depends: [] |