summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-29 09:45:13 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-04-29 09:45:13 +0000
commitc9691a9604fdf9d6711204999787d332b7141692 (patch)
tree704f0ca70e81cef02f1338a80a1a8e132230dfab
parent2f422c03925e82bf88b05da823813073a985b0e5 (diff)
parentfe65b6b9c8108e4ce5f7cc6216b9b7c3b0548f19 (diff)
downloaddistcc-c9691a9604fdf9d6711204999787d332b7141692.tar.gz
Merge branch 'baserock/sam/gcc-4.7' into baserock/morphbaserock/morph
Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--distcc.morph12
1 files changed, 12 insertions, 0 deletions
diff --git a/distcc.morph b/distcc.morph
new file mode 100644
index 0000000..162c1cb
--- /dev/null
+++ b/distcc.morph
@@ -0,0 +1,12 @@
+name: distcc
+kind: chunk
+build-system: autotools
+configure-commands:
+ - NOCONFIGURE=1 ./autogen.sh
+ # We must disable -Werror because there are two warnings in the 32-bit build.
+ # These are inside the lzo/minilzo.c code. They do not appear to be fixed in
+ # distcc master as of April 2014. The code in question appears in an intense
+ # battle with C's type system, I don't see any clear way to resolve it. I
+ # have reported this upstream:
+ # https://code.google.com/p/distcc/issues/detail?id=142
+ - ./configure --prefix="$PREFIX" --disable-Werror