This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 2fd8f0a ARROW-2204: Fix TLS errors in manylinux1 build
2fd8f0a is described below
commit 2fd8f0ac00ed810fd46090dad95874e33dcb5d49
Author: Uwe L. Korn <[email protected]>
AuthorDate: Sun Feb 25 12:10:04 2018 +0100
ARROW-2204: Fix TLS errors in manylinux1 build
Author: Uwe L. Korn <[email protected]>
Closes #1655 from xhochy/ARROW-2204 and squashes the following commits:
1a21f17 [Uwe L. Korn] ARROW-2204: Fix TLS errors in manylinux1 build
---
python/manylinux1/Dockerfile-x86_64 | 2 +-
python/manylinux1/Dockerfile-x86_64_base | 3 ---
python/manylinux1/scripts/build_brotli.sh | 2 +-
python/manylinux1/scripts/build_flatbuffers.sh | 2 +-
python/manylinux1/scripts/build_gtest.sh | 2 +-
python/manylinux1/scripts/build_jemalloc.sh | 31 --------------------------
python/manylinux1/scripts/build_lz4.sh | 2 +-
python/manylinux1/scripts/build_snappy.sh | 2 +-
python/manylinux1/scripts/build_zstd.sh | 2 +-
9 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/python/manylinux1/Dockerfile-x86_64
b/python/manylinux1/Dockerfile-x86_64
index ec52033..f2b64e6 100644
--- a/python/manylinux1/Dockerfile-x86_64
+++ b/python/manylinux1/Dockerfile-x86_64
@@ -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
diff --git a/python/manylinux1/Dockerfile-x86_64_base
b/python/manylinux1/Dockerfile-x86_64_base
index 1f15f77..4dfb131 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -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
diff --git a/python/manylinux1/scripts/build_brotli.sh
b/python/manylinux1/scripts/build_brotli.sh
index 9a1eca7..c2659d2 100755
--- a/python/manylinux1/scripts/build_brotli.sh
+++ b/python/manylinux1/scripts/build_brotli.sh
@@ -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
diff --git a/python/manylinux1/scripts/build_flatbuffers.sh
b/python/manylinux1/scripts/build_flatbuffers.sh
index 683a89c..509ec41 100755
--- a/python/manylinux1/scripts/build_flatbuffers.sh
+++ b/python/manylinux1/scripts/build_flatbuffers.sh
@@ -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"
diff --git a/python/manylinux1/scripts/build_gtest.sh
b/python/manylinux1/scripts/build_gtest.sh
index 4ce20c1..f921efd 100755
--- a/python/manylinux1/scripts/build_gtest.sh
+++ b/python/manylinux1/scripts/build_gtest.sh
@@ -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
diff --git a/python/manylinux1/scripts/build_jemalloc.sh
b/python/manylinux1/scripts/build_jemalloc.sh
deleted file mode 100755
index 370bdcd..0000000
--- a/python/manylinux1/scripts/build_jemalloc.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -ex
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-wget
https://github.com/jemalloc/jemalloc/archive/17c897976c60b0e6e4f4a365c751027244dada7a.tar.gz
-O jemalloc.tar.gz
-tar xf jemalloc.tar.gz
-mv jemalloc-* jemalloc
-pushd /jemalloc
-./autogen.sh
-./configure "--with-jemalloc-prefix=je_arrow_"
"--with-private-namespace=je_arrow_private_"
-# Skip doc generation
-touch doc/jemalloc.html
-touch doc/jemalloc.3
-make -j5
-make install
-popd
-rm -rf jemalloc.tar.gz jemalloc
diff --git a/python/manylinux1/scripts/build_lz4.sh
b/python/manylinux1/scripts/build_lz4.sh
index 8242a5f..4c77061 100755
--- a/python/manylinux1/scripts/build_lz4.sh
+++ b/python/manylinux1/scripts/build_lz4.sh
@@ -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}
diff --git a/python/manylinux1/scripts/build_snappy.sh
b/python/manylinux1/scripts/build_snappy.sh
index 5392e14..bc3afe6 100755
--- a/python/manylinux1/scripts/build_snappy.sh
+++ b/python/manylinux1/scripts/build_snappy.sh
@@ -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'
diff --git a/python/manylinux1/scripts/build_zstd.sh
b/python/manylinux1/scripts/build_zstd.sh
index ef0e267..ccfda3f 100755
--- a/python/manylinux1/scripts/build_zstd.sh
+++ b/python/manylinux1/scripts/build_zstd.sh
@@ -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}
--
To stop receiving notification emails like this one, please contact
[email protected].
