Skip to content

ARROW-2204: Fix TLS errors in manylinux1 build #1655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xhochy wants to merge 1 commit into from
Closed

ARROW-2204: Fix TLS errors in manylinux1 build #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/manylinux1/Dockerfile-x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2143
FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2204

ADD arrow /arrow
WORKDIR /arrow/cpp
Expand Down
3 changes: 0 additions & 3 deletions python/manylinux1/Dockerfile-x86_64_base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ RUN /build_openssl.sh
ADD scripts/build_boost.sh /
RUN /build_boost.sh

ADD scripts/build_jemalloc.sh /
RUN /build_jemalloc.sh

# Install cmake manylinux1 package
ADD scripts/install_cmake.sh /
RUN /install_cmake.sh
Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_brotli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.

export BROTLI_VERSION="0.6.0"
wget "https://github.com/google/brotli/archive/v${BROTLI_VERSION}.tar.gz" -O brotli-${BROTLI_VERSION}.tar.gz
curl -sL "https://github.com/google/brotli/archive/v${BROTLI_VERSION}.tar.gz" -o brotli-${BROTLI_VERSION}.tar.gz
tar xf brotli-${BROTLI_VERSION}.tar.gz
pushd brotli-${BROTLI_VERSION}
mkdir build
Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_flatbuffers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

wget https://github.com/google/flatbuffers/archive/v1.6.0.tar.gz -O flatbuffers-1.6.0.tar.gz
curl -sL https://github.com/google/flatbuffers/archive/v1.6.0.tar.gz -o flatbuffers-1.6.0.tar.gz
tar xf flatbuffers-1.6.0.tar.gz
pushd flatbuffers-1.6.0
cmake "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_INSTALL_PREFIX:PATH=/usr" "-DFLATBUFFERS_BUILD_TESTS=OFF"
Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_gtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

wget https://github.com/google/googletest/archive/release-1.7.0.tar.gz -O googletest-release-1.7.0.tar.gz
curl -sL https://github.com/google/googletest/archive/release-1.7.0.tar.gz -o googletest-release-1.7.0.tar.gz
tar xf googletest-release-1.7.0.tar.gz
ls -l
pushd googletest-release-1.7.0
Expand Down
31 changes: 0 additions & 31 deletions python/manylinux1/scripts/build_jemalloc.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_lz4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export LZ4_VERSION="1.7.5"
export PREFIX="/usr"
export CFLAGS="${CFLAGS} -O3 -fPIC"
export LDFLAGS="${LDFLAGS} -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
wget "https://github.com/lz4/lz4/archive/v${LZ4_VERSION}.tar.gz" -O lz4-${LZ4_VERSION}.tar.gz
curl -sL "https://github.com/lz4/lz4/archive/v${LZ4_VERSION}.tar.gz" -o lz4-${LZ4_VERSION}.tar.gz
tar xf lz4-${LZ4_VERSION}.tar.gz
pushd lz4-${LZ4_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_snappy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.

export SNAPPY_VERSION="1.1.3"
wget "https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz" -O snappy-${SNAPPY_VERSION}.tar.gz
curl -sL "https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz" -o snappy-${SNAPPY_VERSION}.tar.gz
tar xf snappy-${SNAPPY_VERSION}.tar.gz
pushd snappy-${SNAPPY_VERSION}
./configure --with-pic "--prefix=/usr" CXXFLAGS='-DNDEBUG -O2'
Expand Down
2 changes: 1 addition & 1 deletion python/manylinux1/scripts/build_zstd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export ZSTD_VERSION="1.2.0"
export CFLAGS="${CFLAGS} -O3 -fPIC"
export PREFIX="/usr"
export LDFLAGS="${LDFLAGS} -Wl,-rpath,${PREFIX}/lib"
wget "https://github.com/facebook/zstd/archive/v${ZSTD_VERSION}.tar.gz" -O zstd-${ZSTD_VERSION}.tar.gz
curl -sL "https://github.com/facebook/zstd/archive/v${ZSTD_VERSION}.tar.gz" -o zstd-${ZSTD_VERSION}.tar.gz
tar xf zstd-${ZSTD_VERSION}.tar.gz
pushd zstd-${ZSTD_VERSION}

Expand Down