ARROW-4778: [C++/Python] manylinux1: Update Thrift to 0.12.0

Author: Uwe L. Korn <[email protected]> Author: Uwe L. Korn <[email protected]> Closes #3823 from xhochy/ARROW-4778 and squashes the following commits: 20a0e14 <Uwe L. Korn> Update .travis.yml ae167f7 <Uwe L. Korn> ARROW-4778: manylinux1: Update Thrift to 0.12.0
apache · Mar 6, 2019 · b77b662 · b77b662
1 parent 24e6ef0
commit b77b662
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -226,8 +226,9 @@ matrix:
     language: cpp
     env:
     - PYTHON_VERSIONS="2.7,32 3.6,16"
+    - MANYLINUX1_IMAGE="quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-4778"
     before_script:
-    - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker pull quay.io/xhochy/arrow_manylinux1_x86_64_base:llvm-7-manylinux1; fi
+    - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then docker pull $MANYLINUX1_IMAGE; fi
     script:
     - if [ $ARROW_CI_PYTHON_AFFECTED == "1" ]; then $TRAVIS_BUILD_DIR/ci/travis_script_manylinux.sh; fi
   - name: "Java w/ OpenJDK 8"

diff --git a/ci/travis_script_manylinux.sh b/ci/travis_script_manylinux.sh
@@ -53,7 +53,7 @@ for PYTHON_TUPLE in ${PYTHON_VERSIONS}; do
     -e UNICODE_WIDTH=$UNICODE_WIDTH \
     -v $PWD:/io \
     -v $PWD/../../:/arrow \
-    quay.io/pravindra/arrow_manylinux1_x86_64_base:latest \
+    $MANYLINUX1_IMAGE \
     /io/build_arrow.sh
 
   # create a testing conda environment

diff --git 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.11.0
+export THRIFT_VERSION=0.12.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}
@@ -27,14 +27,15 @@ cmake -DCMAKE_BUILD_TYPE=release \
     "-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" \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_TESTING=OFF \
+    -DWITH_QT4=OFF \
+    -DWITH_C_GLIB=OFF \
+    -DWITH_JAVA=OFF \
+    -DWITH_PYTHON=OFF \
+    -DWITH_CPP=ON \
+    -DWITH_STATIC_LIB=ON \
+    -DWITH_SHARED_LIB=OFF \
     -DBoost_NAMESPACE=arrow_boost \
     -DBOOST_ROOT=/arrow_boost_dist \
     -GNinja ..