summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-10 12:07:57 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-07-11 15:35:13 (GMT)
commit65e06d2a6d24ba80e6a0334a0b84a3e1464af308 (patch)
tree2c5ea4573890290e64b75e6d0814c3d368a8ff3b
parentbf05427fecd0318dea7ff639c9b5c3a669a66380 (diff)
downloaddefinitions-65e06d2a6d24ba80e6a0334a0b84a3e1464af308.tar.gz
build-essential: Update ccache to latest stable tarball (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. We were previously building from a branch in our mirror of the upstream Git repo which had files from the release tarball committed. Now we have proper tarball import repo.
-rw-r--r--strata/build-essential.morph6
-rw-r--r--strata/build-essential/ccache.morph2
2 files changed, 5 insertions, 3 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index e56d757..207d041 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: 567631456f0899cdf0c382f898d38aadc8901d32
- unpetrify-ref: baserock/build-essential
+ 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 383eee8..441344f 100644
--- a/strata/build-essential/ccache.morph
+++ b/strata/build-essential/ccache.morph
@@ -1,8 +1,10 @@
name: ccache
kind: chunk
build-system: autotools
+
configure-commands:
- ./configure --prefix="$PREFIX"
+
install-commands:
- make DESTDIR="$DESTDIR" install
- mkdir -p "$DESTDIR/$PREFIX/lib/ccache"