gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More build fixes.

Browse Source
This commit is contained in:
Adam Ierymenko
2016-06-27 14:21:54 -07:00
parent 8de5b2beda
commit 147f735333
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
linux-build-farm/centos-6/x64/Dockerfile
View File

@@ -5,10 +5,13 @@ RUN yum update -y
RUN yum install -y epel-release
RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
RUN yum install -y centos-release-scl
RUN yum install -y devtoolset-4-gcc-c++
#RUN yum install -y centos-release-scl
#RUN yum install -y devtoolset-4-gcc-c++
RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
RUN yum install -y clang
RUN yum install -y gcc-c++
#RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
#RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
ADD zt1-src.tar.gz /

8
linux-build-farm/centos-6/x86/Dockerfile
View File

@@ -17,7 +17,7 @@ RUN yum install -y gcc-c++
ADD zt1-src.tar.gz /
RUN mv /ZeroTierOne/make-linux.mk /ZeroTierOne/make-linux.mk.old
RUN echo 'CFLAGS=-O3 -fstack-protector' >/ZeroTierOne/make-linux.mk
RUN echo 'CXXFLAGS=-O3 -fstack-protector' >>/ZeroTierOne/make-linux.mk
RUN cat /ZeroTierOne/make-linux.mk.old >>/ZeroTierOne/make-linux.mk
#RUN mv /ZeroTierOne/make-linux.mk /ZeroTierOne/make-linux.mk.old
#RUN echo 'CFLAGS=-O3 -fstack-protector' >/ZeroTierOne/make-linux.mk
#RUN echo 'CXXFLAGS=-O3 -fstack-protector' >>/ZeroTierOne/make-linux.mk
#RUN cat /ZeroTierOne/make-linux.mk.old >>/ZeroTierOne/make-linux.mk