You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/12/17 16:01:24 UTC
[arrow] branch master updated: ARROW-4054: [Python] Update gtest,
flatbuffers and OpenSSL in manylinux1 base image
This is an automated email from the ASF dual-hosted git repository.
wesm 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 0190e60 ARROW-4054: [Python] Update gtest, flatbuffers and OpenSSL in manylinux1 base image
0190e60 is described below
commit 0190e60e4abd4f07428f8d6c04e76f42f70d4ce3
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Mon Dec 17 10:01:16 2018 -0600
ARROW-4054: [Python] Update gtest, flatbuffers and OpenSSL in manylinux1 base image
Author: Korn, Uwe <Uw...@blue-yonder.com>
Closes #3202 from xhochy/ARROW-4054 and squashes the following commits:
d777fe98a <Korn, Uwe> ARROW-4054: Update gtest, flatbuffers and OpenSSL in manylinux1 base image
---
python/manylinux1/Dockerfile-x86_64_base | 2 +-
python/manylinux1/scripts/build_flatbuffers.sh | 2 +-
python/manylinux1/scripts/build_gtest.sh | 25 +++++++++++++++++++------
python/manylinux1/scripts/build_openssl.sh | 10 ++++++----
4 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/python/manylinux1/Dockerfile-x86_64_base b/python/manylinux1/Dockerfile-x86_64_base
index d4b8462..8ba205e 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -34,7 +34,7 @@ RUN /install_cmake.sh
ADD scripts/build_gtest.sh /
RUN /build_gtest.sh
-ENV GTEST_HOME /googletest-release-1.7.0
+ENV GTEST_HOME /usr
ADD scripts/build_flatbuffers.sh /
RUN /build_flatbuffers.sh
diff --git a/python/manylinux1/scripts/build_flatbuffers.sh b/python/manylinux1/scripts/build_flatbuffers.sh
index 70b184c..cae32f5 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.
-export FLATBUFFERS_VERSION=1.9.0
+export FLATBUFFERS_VERSION=1.10.0
curl -sL https://github.com/google/flatbuffers/archive/v${FLATBUFFERS_VERSION}.tar.gz \
-o flatbuffers-${FLATBUFFERS_VERSION}.tar.gz
tar xf flatbuffers-${FLATBUFFERS_VERSION}.tar.gz
diff --git a/python/manylinux1/scripts/build_gtest.sh b/python/manylinux1/scripts/build_gtest.sh
index f921efd..5b29f5e 100755
--- a/python/manylinux1/scripts/build_gtest.sh
+++ b/python/manylinux1/scripts/build_gtest.sh
@@ -16,11 +16,24 @@
# specific language governing permissions and limitations
# under the License.
-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
+GTEST_VERSION=1.8.1
+
+curl -sL https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -o googletest-release-${GTEST_VERSION}.tar.gz
+tar xf googletest-release-${GTEST_VERSION}.tar.gz
ls -l
-pushd googletest-release-1.7.0
-cmake -DCMAKE_CXX_FLAGS='-fPIC' -Dgtest_force_shared_crt=ON .
-make -j5
+pushd googletest-release-${GTEST_VERSION}
+
+mkdir build_so
+pushd build_so
+cmake -DCMAKE_CXX_FLAGS='-fPIC' -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=ON -DBUILD_GMOCK=OFF -GNinja -DCMAKE_INSTALL_PREFIX=/usr ..
+ninja install
+popd
+
+mkdir build_a
+pushd build_a
+cmake -DCMAKE_CXX_FLAGS='-fPIC' -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_GMOCK=OFF -GNinja -DCMAKE_INSTALL_PREFIX=/usr ..
+ninja install
+popd
+
popd
-rm -rf googletest-release-1.7.0.tar.gz
+rm -rf googletest-release-${GTEST_VERSION}.tar.gz
diff --git a/python/manylinux1/scripts/build_openssl.sh b/python/manylinux1/scripts/build_openssl.sh
index 1a54d72..622004d 100755
--- a/python/manylinux1/scripts/build_openssl.sh
+++ b/python/manylinux1/scripts/build_openssl.sh
@@ -16,11 +16,13 @@
# specific language governing permissions and limitations
# under the License.
-wget --no-check-certificate https://www.openssl.org/source/openssl-1.0.2k.tar.gz -O openssl-1.0.2k.tar.gz
-tar xf openssl-1.0.2k.tar.gz
-pushd openssl-1.0.2k
+OPENSSL_VERSION="1.0.2q"
+
+wget --no-check-certificate https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
+tar xf openssl-${OPENSSL_VERSION}.tar.gz
+pushd openssl-${OPENSSL_VERSION}
./config -fpic shared --prefix=/usr
make -j5
make install
popd
-rm -rf openssl-1.0.2k.tar.gz openssl-1.0.2k
+rm -rf openssl-${OPENSSL_VERSION}.tar.gz openssl-${OPENSSL_VERSION}