From b732c445b8cac725806e23915be97a533da2d13e Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 5 Jul 2016 14:09:33 -0700 Subject: Xenial fix (clang broken) and bundle http-parser even in Fedora because it is so version sensitive. --- linux-build-farm/ubuntu-xenial/x64/Dockerfile | 6 ++++-- linux-build-farm/ubuntu-xenial/x86/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'linux-build-farm') diff --git a/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/linux-build-farm/ubuntu-xenial/x64/Dockerfile index e169843a..03a65c55 100644 --- a/linux-build-farm/ubuntu-xenial/x64/Dockerfile +++ b/linux-build-farm/ubuntu-xenial/x64/Dockerfile @@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko RUN apt-get update RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.8 -RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang +#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang + +RUN rm -f /usr/bin/clang++ /usr/bin/clang ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-xenial/x86/Dockerfile b/linux-build-farm/ubuntu-xenial/x86/Dockerfile index fdee712f..3d04a57d 100644 --- a/linux-build-farm/ubuntu-xenial/x86/Dockerfile +++ b/linux-build-farm/ubuntu-xenial/x86/Dockerfile @@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko RUN apt-get update RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.8 -RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang +#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang + +RUN rm -f /usr/bin/clang++ /usr/bin/clang ADD zt1-src.tar.gz / -- cgit v1.2.3