[
https://issues.apache.org/jira/browse/ARROW-2212?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16377070#comment-16377070
]
ASF GitHub Bot commented on ARROW-2212:
---------------------------------------
wesm closed pull request #1662: ARROW-2212: [C++/Python] Build Protobuf in base
manylinux 1 docker image
URL: https://github.com/apache/arrow/pull/1662
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index e64284cf0..944ca1d3b 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -110,6 +110,10 @@ if (DEFINED ENV{GRPC_HOME})
set(GRPC_HOME "$ENV{GRPC_HOME}")
endif()
+if (DEFINED ENV{PROTOBUF_HOME})
+ set(PROTOBUF_HOME "$ENV{PROTOBUF_HOME}")
+endif()
+
# Ensure that a default make is set
if ("${MAKE}" STREQUAL "")
if (NOT MSVC)
diff --git a/python/manylinux1/Dockerfile-x86_64
b/python/manylinux1/Dockerfile-x86_64
index f2b64e60b..62a089329 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-2204
+FROM quay.io/xhochy/arrow_manylinux1_x86_64_base:ARROW-2212
ADD arrow /arrow
WORKDIR /arrow/cpp
diff --git a/python/manylinux1/Dockerfile-x86_64_base
b/python/manylinux1/Dockerfile-x86_64_base
index 4dfb131c7..955abdd93 100644
--- a/python/manylinux1/Dockerfile-x86_64_base
+++ b/python/manylinux1/Dockerfile-x86_64_base
@@ -63,6 +63,10 @@ ENV ZSTD_HOME /usr
ADD scripts/build_ccache.sh /
RUN /build_ccache.sh
+ADD scripts/build_protobuf.sh /
+RUN /build_protobuf.sh
+ENV PROTOBUF_HOME /usr
+
WORKDIR /
RUN git clone https://github.com/matthew-brett/multibuild.git && cd multibuild
&& git checkout ffe59955ad8690c2f8bb74766cb7e9b0d0ee3963
diff --git a/python/manylinux1/scripts/build_protobuf.sh
b/python/manylinux1/scripts/build_protobuf.sh
new file mode 100755
index 000000000..c3ea8007f
--- /dev/null
+++ b/python/manylinux1/scripts/build_protobuf.sh
@@ -0,0 +1,28 @@
+#!/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.
+
+PROTOBUF_VERSION="2.6.0"
+
+curl -sL
https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz
-o protobuf-${PROTOBUF_VERSION}.tar.gz
+tar xf protobuf-${PROTOBUF_VERSION}.tar.gz
+pushd protobuf-${PROTOBUF_VERSION}
+./configure --disable-shared --prefix=/usr "CXXFLAGS=-O2 -fPIC"
+make -j5
+make install
+popd
+rm -rf protobuf-${PROTOBUF_VERSION}.tar.gz protobuf-${PROTOBUF_VERSION}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [C++/Python] Build Protobuf in base manylinux 1 docker image
> ------------------------------------------------------------
>
> Key: ARROW-2212
> URL: https://issues.apache.org/jira/browse/ARROW-2212
> Project: Apache Arrow
> Issue Type: Bug
> Reporter: Uwe L. Korn
> Assignee: Uwe L. Korn
> Priority: Major
> Labels: pull-request-available
> Fix For: 0.9.0
>
>
> This should cut down the build times of the {{manylinux1}} CI matrix entry.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
