Skip to content

Commit 6d7e00e

Browse files
committed
fix linux and mac build
1 parent 4c37460 commit 6d7e00e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build-support/dep-url.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env bash
21
#
32
# Licensed to the Apache Software Foundation (ASF) under one
43
# or more contributor license agreements. See the NOTICE file
@@ -36,7 +35,8 @@ download_dependency() {
3635

3736
DEP_FILE=$1
3837
DEP=$2
39-
read -r DEP VERSION <<<$(grep $DEP $DEP_FILE | sed 's/://')
38+
# Here we don't use read command to make it available in Alpine
39+
VERSION=$(grep $DEP $DEP_FILE | sed 's/://' | awk '{print $2}')
4040

4141
if [[ $DEP == "cmake" ]]; then
4242
curl -O -L https://github.com/Kitware/CMake/releases/download/v${VERSION}/cmake-${VERSION}-linux-${ARCH}.tar.gz

pkg/manylinux2014/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN pip3 install pyyaml
3737
ADD .build/dependencies.yaml /
3838
ADD .build/dep-version.py /usr/local/bin
3939
ADD .build/dep-url.sh /usr/local/bin
40-
RUN . /usr/local/bin/dep-url.sh
40+
SHELL ["/bin/bash", "-c", "source /usr/local/bin/dep-url.sh"]
4141

4242
# Download and install boost
4343
RUN BOOST_VERSION=$(dep-version.py boost) && \

pkg/manylinux_musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN apk add cmake
4040
ADD .build/dependencies.yaml /
4141
ADD .build/dep-version.py /usr/local/bin
4242
ADD .build/dep-url.sh /usr/local/bin
43-
RUN . /usr/local/bin/dep-url.sh
43+
SHELL ["/bin/ash", "-c", "source /usr/local/bin/dep-url.sh"]
4444

4545
# Download and install boost
4646
RUN BOOST_VERSION=$(dep-version.py boost) && \

0 commit comments

Comments
 (0)