ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 15:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Xenial fix (clang broken) and bundle http-parser even in Fedora because it is so version sensitive.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-07-05 14:09:33 -07:00
parent 97ec88e346
commit b732c445b8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-build-farm/ubuntu-xenial/x64/Dockerfile
View File

@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN apt-get update 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 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 / ADD zt1-src.tar.gz /

6
linux-build-farm/ubuntu-xenial/x86/Dockerfile
View File

@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN apt-get update 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 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 / ADD zt1-src.tar.gz /

4
zerotier-one.spec
View File

@ -12,7 +12,6 @@ BuildRequires: systemd
%endif %endif
%if 0%{?fedora} >= 21 %if 0%{?fedora} >= 21
BuildRequires: http-parser-devel
BuildRequires: lz4-devel BuildRequires: lz4-devel
BuildRequires: libnatpmp-devel BuildRequires: libnatpmp-devel
BuildRequires: systemd BuildRequires: systemd
@ -30,19 +29,18 @@ Requires: chkconfig
%endif %endif
%if 0%{?fedora} >= 21 %if 0%{?fedora} >= 21
Requires: http-parser
Requires: lz4 Requires: lz4
Requires: libnatpmp Requires: libnatpmp
Requires: systemd Requires: systemd
Requires: json-parser Requires: json-parser
%endif %endif
Provides: bundled(http-parser) = 2.7.0
Provides: bundled(miniupnpc) = 2.0 Provides: bundled(miniupnpc) = 2.0
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
Provides: bundled(json-parser) = 1.1.0 Provides: bundled(json-parser) = 1.1.0
Provides: bundled(lz4) = 1.7.1 Provides: bundled(lz4) = 1.7.1
Provides: bundled(http-parser) = 2.7.0
Provides: bundled(libnatpmp) = 20131126 Provides: bundled(libnatpmp) = 20131126
%endif %endif