diff options
Diffstat (limited to 'strata')
| -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" |