You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2018/01/30 09:31:28 UTC
[arrow] branch master updated: ARROW-2048: [Python/C++] Upate
Thrift pin to 0.11
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 0621765 ARROW-2048: [Python/C++] Upate Thrift pin to 0.11
0621765 is described below
commit 0621765defc022e0fae68f4cac52835699b98500
Author: Uwe L. Korn <uw...@xhochy.com>
AuthorDate: Tue Jan 30 10:31:20 2018 +0100
ARROW-2048: [Python/C++] Upate Thrift pin to 0.11
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #1528 from xhochy/ARROW-2048 and squashes the following commits:
aa0212a [Uwe L. Korn] ARROW-2048: [Python/C++] Upate Thrift pin to 0.11
---
ci/msvc-build.bat | 2 +-
ci/travis_before_script_cpp.sh | 2 +-
cpp/src/arrow/stl.h | 1 +
python/manylinux1/Dockerfile-x86_64 | 2 +-
python/manylinux1/Dockerfile-x86_64_base | 3 +++
.../scripts/{build_thrift.sh => build_bison.sh} | 28 +++++-----------------
python/manylinux1/scripts/build_thrift.sh | 2 +-
7 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
index 94eb16a..9651772 100644
--- a/ci/msvc-build.bat
+++ b/ci/msvc-build.bat
@@ -81,7 +81,7 @@ conda info -a
conda create -n arrow -q -y python=%PYTHON% ^
six pytest setuptools numpy pandas cython ^
- thrift-cpp=0.10.0
+ thrift-cpp=0.11.0
if "%JOB%" == "Toolchain" (
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index 2f164c4..7c1d726 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -47,7 +47,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
zlib \
cmake \
curl \
- thrift-cpp=0.10.0 \
+ thrift-cpp=0.11.0 \
ninja
# HACK(wesm): We started experiencing OpenSSL failures when Miniconda was
diff --git a/cpp/src/arrow/stl.h b/cpp/src/arrow/stl.h
index 3250b5a..1e31ca7 100644
--- a/cpp/src/arrow/stl.h
+++ b/cpp/src/arrow/stl.h
@@ -18,6 +18,7 @@
#ifndef ARROW_STL_H
#define ARROW_STL_H
+#include <memory>
#include <string>
#include <tuple>
#include <vector>
diff --git a/python/manylinux1/Dockerfile-x86_64 b/python/manylinux1/Dockerfile-x86_64
index 919a32b..9c00e7e 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:latest
+FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2048
ADD arrow /arrow
WORKDIR /arrow/cpp
diff --git a/python/manylinux1/Dockerfile-x86_64_base b/python/manylinux1/Dockerfile-x86_64_base
index 0160aa4..ec78930 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -42,6 +42,9 @@ ADD scripts/build_flatbuffers.sh /
RUN /build_flatbuffers.sh
ENV FLATBUFFERS_HOME /usr
+ADD scripts/build_bison.sh /
+RUN /build_bison.sh
+
ADD scripts/build_thrift.sh /
RUN /build_thrift.sh
ENV THRIFT_HOME /usr
diff --git a/python/manylinux1/scripts/build_thrift.sh b/python/manylinux1/scripts/build_bison.sh
similarity index 54%
copy from python/manylinux1/scripts/build_thrift.sh
copy to python/manylinux1/scripts/build_bison.sh
index 28aa75b..29cc0be 100755
--- a/python/manylinux1/scripts/build_thrift.sh
+++ b/python/manylinux1/scripts/build_bison.sh
@@ -16,27 +16,11 @@
# specific language governing permissions and limitations
# under the License.
-export THRIFT_VERSION=0.10.0
-wget http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
-tar xf thrift-${THRIFT_VERSION}.tar.gz
-pushd thrift-${THRIFT_VERSION}
-mkdir build-tmp
-pushd build-tmp
-cmake -DCMAKE_BUILD_TYPE=release \
- "-DCMAKE_CXX_FLAGS=-fPIC" \
- "-DCMAKE_C_FLAGS=-fPIC" \
- "-DCMAKE_INSTALL_PREFIX=/usr" \
- "-DCMAKE_INSTALL_RPATH=/usr/lib" \
- "-DBUILD_SHARED_LIBS=OFF" \
- "-DBUILD_TESTING=OFF" \
- "-DWITH_QT4=OFF" \
- "-DWITH_C_GLIB=OFF" \
- "-DWITH_JAVA=OFF" \
- "-DWITH_PYTHON=OFF" \
- "-DWITH_CPP=ON" \
- "-DWITH_STATIC_LIB=ON" ..
-make -j5
+wget http://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz
+tar xf bison-3.0.4.tar.gz
+pushd bison-3.0.4
+./configure --prefix=/usr
+make -j4
make install
popd
-popd
-rm -rf thrift-${THRIFT_VERSION}.tar.gz thrift-${THRIFT_VERSION}
+rm -rf bison-3.0.4 bison-3.0.4.tar.gz
diff --git a/python/manylinux1/scripts/build_thrift.sh b/python/manylinux1/scripts/build_thrift.sh
index 28aa75b..aaec4ad 100755
--- a/python/manylinux1/scripts/build_thrift.sh
+++ b/python/manylinux1/scripts/build_thrift.sh
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-export THRIFT_VERSION=0.10.0
+export THRIFT_VERSION=0.11.0
wget http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
tar xf thrift-${THRIFT_VERSION}.tar.gz
pushd thrift-${THRIFT_VERSION}
--
To stop receiving notification emails like this one, please contact
uwe@apache.org.