diff options
| author | Dusan Klinec <dusan.klinec@gmail.com> | 2018-12-04 22:01:03 +0100 |
|---|---|---|
| committer | Dusan Klinec <dusan.klinec@gmail.com> | 2018-12-18 16:50:19 +0100 |
| commit | e37154a87902dca1653458d3eecb385d08ed661b (patch) | |
| tree | 304b8161013408840f2ef8611d9f46d2b8221f8c /Dockerfile | |
| parent | Merge pull request #4927 (diff) | |
| download | monero-e37154a87902dca1653458d3eecb385d08ed661b.tar.xz | |
build: protobuf dependency fixes, libusb build
- docker protobuf dependencies, cross-compilation
- device/trezor protobuf build fixes, try_compile
- libusb built under all platforms, used by trezor for direct connect
Diffstat (limited to '')
| -rw-r--r-- | Dockerfile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 0728c6ce8..9fe7cfb8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,8 @@ RUN set -ex && \ automake \ bzip2 \ xsltproc \ - gperf + gperf \ + unzip WORKDIR /usr/local @@ -147,6 +148,20 @@ RUN set -ex \ && make \ && make install +# Protobuf +ARG PROTOBUF_VERSION=v3.6.1 +ARG PROTOBUF_HASH=48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 +RUN set -ex \ + && git clone https://github.com/protocolbuffers/protobuf -b ${PROTOBUF_VERSION} \ + && cd protobuf \ + && test `git rev-parse HEAD` = ${PROTOBUF_HASH} || exit 1 \ + && git submodule update --init --recursive \ + && ./autogen.sh \ + && CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --enable-static --disable-shared \ + && make \ + && make install \ + && ldconfig + WORKDIR /src COPY . . |