diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-05 14:09:33 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-05 14:09:33 -0700 |
| commit | b732c445b8cac725806e23915be97a533da2d13e (patch) | |
| tree | 210134dbe09616c9802ca6ccda7668c39fe60930 | |
| parent | 97ec88e346b2cdaa939e9af243eaed9a54ce65f6 (diff) | |
| download | infinitytier-b732c445b8cac725806e23915be97a533da2d13e.tar.gz infinitytier-b732c445b8cac725806e23915be97a533da2d13e.zip | |
Xenial fix (clang broken) and bundle http-parser even in Fedora because it is so version sensitive.
| -rw-r--r-- | linux-build-farm/ubuntu-xenial/x64/Dockerfile | 6 | ||||
| -rw-r--r-- | linux-build-farm/ubuntu-xenial/x86/Dockerfile | 6 | ||||
| -rw-r--r-- | zerotier-one.spec | 4 |
3 files changed, 9 insertions, 7 deletions
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 <adam.ierymenko@zerotier.com> 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 <adam.ierymenko@zerotier.com> 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/zerotier-one.spec b/zerotier-one.spec index f8ef0c3b..beda4cca 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -12,7 +12,6 @@ BuildRequires: systemd %endif %if 0%{?fedora} >= 21 -BuildRequires: http-parser-devel BuildRequires: lz4-devel BuildRequires: libnatpmp-devel BuildRequires: systemd @@ -30,19 +29,18 @@ Requires: chkconfig %endif %if 0%{?fedora} >= 21 -Requires: http-parser Requires: lz4 Requires: libnatpmp Requires: systemd Requires: json-parser %endif +Provides: bundled(http-parser) = 2.7.0 Provides: bundled(miniupnpc) = 2.0 %if 0%{?rhel} >= 6 Provides: bundled(json-parser) = 1.1.0 Provides: bundled(lz4) = 1.7.1 -Provides: bundled(http-parser) = 2.7.0 Provides: bundled(libnatpmp) = 20131126 %endif |