Skip to content

Commit

Permalink
Fix cross-compilation in Alpine (#231)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome authored Nov 11, 2021
1 parent 54f0208 commit c66d035
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ RUN apk add --no-cache \
COPY --from=xx / /
ARG TARGETPLATFORM

RUN xx-apk add --no-cache xx-cxx-essentials openssl-dev zlib-dev libgcc curl-dev msgpack-c-dev
RUN xx-apk add --no-cache xx-cxx-essentials openssl-dev zlib-dev zlib libgcc curl-dev msgpack-c-dev


### Build image
FROM build-base-${BUILD_OS} as build-base

ENV CMAKE_VERSION 3.21.3
ENV CMAKE_VERSION 3.21.4
RUN wget -q -O cmake-linux.sh "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(arch).sh" \
&& sh cmake-linux.sh -- --skip-license --prefix=/usr \
&& rm cmake-linux.sh
Expand Down Expand Up @@ -98,7 +98,7 @@ RUN xx-info env && git clone --depth 1 -b $OPENTRACING_CPP_VERSION https://githu
&& cd opentracing-cpp \
&& mkdir .build && cd .build \
&& cmake $(xx-clang --print-cmake-defines) \
-DCMAKE_INSTALL_PREFIX=$(xx-info sysroot)/usr/local\
-DCMAKE_INSTALL_PREFIX=$(xx-info sysroot)/usr/local \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=ON \
Expand Down Expand Up @@ -162,7 +162,7 @@ RUN git clone --depth 1 -b $JAEGER_CPP_VERSION https://github.com/jaegertracing/
&& mkdir .build \
&& cd .build \
&& cmake $(xx-clang --print-cmake-defines) \
-DCMAKE_PREFIX_PATH=$(xx-info sysroot)/usr/local \
-DCMAKE_PREFIX_PATH=$(xx-info sysroot) \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TESTING=OFF \
Expand Down Expand Up @@ -191,7 +191,7 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da
&& cd dd-opentracing-cpp \
&& mkdir .build && cd .build \
&& cmake $(xx-clang --print-cmake-defines) \
-DCMAKE_PREFIX_PATH=$(xx-info sysroot)/usr/local \
-DCMAKE_PREFIX_PATH=$(xx-info sysroot) \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_TESTING=OFF .. \
Expand Down

0 comments on commit c66d035

Please sign in to comment.