diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:27:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-02 09:27:04 +0200 |
| commit | 8512a83572094f96aff95e02db359914a37c3c71 (patch) | |
| tree | 493d103071408ba0042a256cf951ff2f542a69cb | |
| parent | Merge pull request #2844 (diff) | |
| parent | Android dockerfile: add zmq dependency (diff) | |
| download | monero-8512a83572094f96aff95e02db359914a37c3c71.tar.xz | |
Merge pull request #2845
c256a248 Android dockerfile: add zmq dependency (MoroccanMalinois)
| -rw-r--r-- | utils/build_scripts/android32.Dockerfile | 15 | ||||
| -rw-r--r-- | utils/build_scripts/android64.Dockerfile | 14 |
2 files changed, 27 insertions, 2 deletions
diff --git a/utils/build_scripts/android32.Dockerfile b/utils/build_scripts/android32.Dockerfile index da81b6435..37d012202 100644 --- a/utils/build_scripts/android32.Dockerfile +++ b/utils/build_scripts/android32.Dockerfile @@ -1,6 +1,6 @@ FROM debian:jessie -RUN apt-get update && apt-get install -y unzip automake build-essential curl file pkg-config git python +RUN apt-get update && apt-get install -y unzip automake build-essential curl file pkg-config git python libtool WORKDIR /opt/android ## INSTALL ANDROID SDK @@ -72,10 +72,23 @@ RUN curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && make build_crypto build_ssl \ && cd .. && mv openssl-${OPENSSL_VERSION} openssl +# ZMQ +RUN git clone https://github.com/zeromq/zeromq4-1.git \ + && git clone https://github.com/zeromq/cppzmq.git \ + && cd zeromq4-1 \ + && ./autogen.sh \ + && CC=clang CXX=clang++ ./configure --host=arm-none-linux-gnueabi \ + && make + +RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/arm-linux-androideabi/lib/armv7-a + RUN git clone https://github.com/monero-project/monero.git \ && cd monero \ && mkdir -p build/release \ && CC=clang CXX=clang++ \ BOOST_ROOT=${WORKDIR}/boost_${BOOST_VERSION} BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \ OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \ + CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \ + CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \ + CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \ make release-static-android diff --git a/utils/build_scripts/android64.Dockerfile b/utils/build_scripts/android64.Dockerfile index 5e6bc05af..70c3c2b41 100644 --- a/utils/build_scripts/android64.Dockerfile +++ b/utils/build_scripts/android64.Dockerfile @@ -1,6 +1,6 @@ FROM debian:jessie -RUN apt-get update && apt-get install -y unzip automake build-essential curl file pkg-config git python +RUN apt-get update && apt-get install -y unzip automake build-essential curl file pkg-config git python libtool WORKDIR /opt/android ## INSTALL ANDROID SDK @@ -72,6 +72,15 @@ RUN curl -s -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && make build_crypto build_ssl \ && cd .. && mv openssl-${OPENSSL_VERSION} openssl +RUN git clone https://github.com/zeromq/zeromq4-1.git \ + && git clone https://github.com/zeromq/cppzmq.git \ + && cd zeromq4-1 \ + && ./autogen.sh \ + && CC=clang CXX=clang++ ./configure --host=aarch64-linux-android \ + && make + +RUN ln -s /opt/android/openssl/libcrypto.a /opt/android/openssl/libssl.a /opt/android/toolchain-arm/aarch64-linux-android/lib + RUN git clone https://github.com/monero-project/monero.git \ && cd monero \ && mkdir -p build/release \ @@ -79,5 +88,8 @@ RUN git clone https://github.com/monero-project/monero.git \ && CC=clang CXX=clang++ \ BOOST_ROOT=${WORKDIR}/boost_${BOOST_VERSION} BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android64/lib/ \ OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \ + CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \ + CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \ + CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \ cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android" ../.. \ && make -j3 |