diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-10 12:26:38 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-10 12:26:38 +0000 |
| commit | 22cefde83dab8366551d69f511fc44933da51da6 (patch) | |
| tree | 0765dedaa76fdb42f457ce50679e62afa7acee85 | |
| parent | 171bcff8d6be3bcad54f948359d1fc5186107b80 (diff) | |
| download | definitions-22cefde83dab8366551d69f511fc44933da51da6.tar.gz | |
Fix ccache upgrade
We need to build from a tarball at this stage, and there's now a proper
tarball import repo to avoid confusion.
| -rw-r--r-- | strata/build-essential.morph | 6 | ||||
| -rw-r--r-- | strata/build-essential/ccache.morph | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 83818157..1dd9cd35 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -395,9 +395,9 @@ chunks: - name: ccache morph: strata/build-essential/ccache.morph - repo: upstream:ccache - ref: 06b49fcd1de3fef7e9f75055f0d85b517bf01e5f - unpetrify-ref: v3.3.4 + repo: upstream:ccache-tarball + ref: 4f49dfd6f2ac799e236f61593ec209228f47f5c5 + unpetrify-ref: ccache-3.3.4 build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/ccache.morph b/strata/build-essential/ccache.morph index e990e93a..441344f9 100644 --- a/strata/build-essential/ccache.morph +++ b/strata/build-essential/ccache.morph @@ -3,16 +3,8 @@ kind: chunk build-system: autotools configure-commands: -# 'dev mode' enables -Werror, which causes the build to fail at time of writing -# due to implicit-fallthrough warnings that are not fixed in 'master'. -- echo > dev_mode_disabled - ./configure --prefix="$PREFIX" -pre-build-commands: -# Documentation requires asciidoc and can't be disabled cleanly, hence -# this hack. -- echo 'ccache man page isn't built in Baserock systems, sorry' > ccache.1 - install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR/$PREFIX/lib/ccache" |