diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-10 12:07:57 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-10 12:13:35 +0000 |
| commit | bbb8b509b3df1cacdcb3f4bb7d163333826733e9 (patch) | |
| tree | a5e1d6fd4587531ebe784b1258dcda108ef3b338 | |
| parent | f70616842045be4d4741425dc9ce2b818125e07c (diff) | |
| download | definitions-bbb8b509b3df1cacdcb3f4bb7d163333826733e9.tar.gz | |
Update ccache to latest stable (3.3.4)
This fixes a weird issue building elfutils where the new GCC 7
implicit-fallthrough warning would trigger (and fail the build
due to -Werror) even though a suitable /* FALLTHROUGH */ comment
was present in the code. The issue only occured when building with
ccache, not when building with real GCC. Clearing the ccache didn't
help either.
The build works with ccache 3.3.4 so whatever bug caused this must
have now been fixed.
| -rw-r--r-- | strata/build-essential.morph | 4 | ||||
| -rw-r--r-- | strata/build-essential/ccache.morph | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index a82cd0c8..83818157 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -396,8 +396,8 @@ chunks: - name: ccache morph: strata/build-essential/ccache.morph repo: upstream:ccache - ref: 567631456f0899cdf0c382f898d38aadc8901d32 - unpetrify-ref: baserock/build-essential + ref: 06b49fcd1de3fef7e9f75055f0d85b517bf01e5f + unpetrify-ref: v3.3.4 build-depends: - stage2-binutils - stage2-busybox diff --git a/strata/build-essential/ccache.morph b/strata/build-essential/ccache.morph index 383eee8a..e990e93a 100644 --- a/strata/build-essential/ccache.morph +++ b/strata/build-essential/ccache.morph @@ -1,8 +1,18 @@ name: ccache 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" |