From baa50d59c4af2f14bb4c79d23bd951d8ff0ae5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 1 Aug 2016 01:15:55 -0400
Subject: [PATCH] docker: add python, lto, msgpack 2.0
---
CMakeLists.txt | 9 +++++----
docker/Dockerfile | 4 ++--
docker/DockerfileDeps | 10 +++++-----
docker/DockerfileDepsLlvm | 12 +++++++-----
docker/DockerfileLlvm | 4 ++--
docker/DockerfileTravis | 2 +-
docker/DockerfileTravisLlvm | 2 +-
7 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 263155a5..e8076597 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,11 +23,12 @@ option (OPENDHT_TOOLS "Build DHT tools" ON)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11 -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT")
if (OPENDHT_LTO)
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -fuse-linker-plugin")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
if (CMAKE_COMPILER_IS_GNUCC)
- SET (CMAKE_AR "gcc-ar")
- SET (CMAKE_NM "gcc-nm")
- SET (CMAKE_RANLIB "gcc-ranlib")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-linker-plugin")
+ set (CMAKE_AR "gcc-ar")
+ set (CMAKE_NM "gcc-nm")
+ set (CMAKE_RANLIB "gcc-ranlib")
endif ()
endif ()
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 304510c3..83867e3c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,5 +2,5 @@ FROM aberaud/opendht-deps
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
- && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \
- && cd ../.. && rm -rf opendht
\ No newline at end of file
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On && make -j8 && make install \
+ && cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index b17a9927..19abd98b 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -1,9 +1,9 @@
FROM ubuntu:16.04
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools
-RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \
- && tar -xzf msgpack-1.4.2.tar.gz \
- && cd msgpack-1.4.2 && mkdir build && cd build \
+RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools && apt-get clean
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.0.0/msgpack-2.0.0.tar.gz \
+ && tar -xzf msgpack-2.0.0.tar.gz \
+ && cd msgpack-2.0.0 && mkdir build && cd build \
&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
&& make -j8 && make install \
- && cd ../.. && rm -rf msgpack-1.4.2
+ && cd ../.. && rm -rf msgpack-2.0.0 msgpack-2.0.0.tar.gz
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 8c8ccf43..418f9945 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -1,11 +1,13 @@
FROM ubuntu:16.04
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
RUN apt-get update \
- && apt-get install -y llvm clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools \
+ && apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools \
&& apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
-RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \
- && tar -xzf msgpack-1.4.2.tar.gz \
- && cd msgpack-1.4.2 && mkdir build && cd build \
+ENV CC cc
+ENV CXX c++
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.0.0/msgpack-2.0.0.tar.gz \
+ && tar -xzf msgpack-2.0.0.tar.gz \
+ && cd msgpack-2.0.0 && mkdir build && cd build \
&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
&& make -j8 && make install \
- && cd ../.. && rm -rf msgpack-1.4.2
+ && cd ../.. && rm -rf msgpack-2.0.0 msgpack-2.0.0.tar.gz
diff --git a/docker/DockerfileLlvm b/docker/DockerfileLlvm
index a66981fd..9bbe5880 100644
--- a/docker/DockerfileLlvm
+++ b/docker/DockerfileLlvm
@@ -2,5 +2,5 @@ FROM aberaud/opendht-deps-llvm
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
- && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \
- && cd ../.. && rm -rf opendht
\ No newline at end of file
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On && make -j8 && make install \
+ && cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileTravis b/docker/DockerfileTravis
index c810ba71..dcb8a267 100644
--- a/docker/DockerfileTravis
+++ b/docker/DockerfileTravis
@@ -2,5 +2,5 @@ FROM aberaud/opendht-deps
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
COPY . /root/opendht
RUN cd /root/opendht && mkdir build && cd build \
- && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \
+ && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On .. && make -j8 && make install \
&& cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm
index 94f89479..b00d3d91 100644
--- a/docker/DockerfileTravisLlvm
+++ b/docker/DockerfileTravisLlvm
@@ -2,5 +2,5 @@ FROM aberaud/opendht-deps-llvm
MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
COPY . /root/opendht
RUN cd /root/opendht && mkdir build && cd build \
- && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \
+ && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On .. && make -j8 && make install \
&& cd ../.. && rm -rf opendht
--
GitLab