diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-08-19 15:10:15 +0000 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-08-19 15:10:15 +0000 |
commit | ebfcbd166dfe49c6632d0aeeb6d2050a4d507576 (patch) | |
tree | a9434b394c11bb86ffb8495306f192afb4756a11 | |
parent | 2b10a9677817377618e33d2b07ab7caefe316633 (diff) | |
download | definitions-ebfcbd166dfe49c6632d0aeeb6d2050a4d507576.tar.gz |
Update cpython morphology to support newer cpython branches.
Also update morph with fix to GitDirectory config caching.
Cpython change reviewed by Richard Maw and Paul Sherwood, each
giving +1.
Morph change reviewed by Richard Maw, +2
-rw-r--r-- | strata/core/cpython.morph | 2 | ||||
-rw-r--r-- | strata/tools.morph | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph index 551c4165..6c9e4b3d 100644 --- a/strata/core/cpython.morph +++ b/strata/core/cpython.morph @@ -4,4 +4,4 @@ build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" --enable-shared post-install-commands: -- ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 +- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 diff --git a/strata/tools.morph b/strata/tools.morph index 4e5f61f0..c6263da1 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -100,7 +100,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 7aec8c2eb0f8ce0dae70559d11db8e84115f8ba6 + ref: 7e2553e2101310e9ddfce2ca93c1c923b062ad1e unpetrify-ref: master build-depends: - cliapp |