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/trove.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/trove.morph')
| -rw-r--r-- | strata/trove.morph | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/strata/trove.morph b/strata/trove.morph index 08fd9f89..63180364 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -4,6 +4,7 @@ description: Trove software build-depends: - morph: strata/tools.morph - morph: strata/morph-utils.morph +- morph: strata/pcre-utils.morph chunks: - name: lua morph: strata/trove/lua.morph @@ -48,18 +49,12 @@ chunks: build-depends: - lua - luxio -- name: pcre - repo: upstream:pcre - ref: 2720152c58e13e7cc7403642ec33127101b9971b - unpetrify-ref: baserock/morph - build-depends: [] - name: lrexlib-pcre morph: strata/trove/lrexlib-pcre.morph repo: upstream:lrexlib ref: 0524a6e3ab6d50cba63c8642a875e246de53d651 unpetrify-ref: baserock/morph build-depends: - - pcre - lua - name: gitano morph: strata/trove/gitano.morph @@ -203,8 +198,7 @@ chunks: repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph - build-depends: - - pcre + build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt |