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/07/11 02:09:17 UTC
[arrow] branch master updated: ARROW-2383: [deb] Use system
Protocol Buffers
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 113430a ARROW-2383: [deb] Use system Protocol Buffers
113430a is described below
commit 113430a7e44e0e77b806e914256c4914cf3dfd6f
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Jul 10 22:09:10 2018 -0400
ARROW-2383: [deb] Use system Protocol Buffers
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #2247 from kou/deb-use-protobuf-package and squashes the following commits:
99e62fad <Kouhei Sutou> Use system Protocol Buffers
---
dev/tasks/linux-packages/apt/debian-stretch/Dockerfile | 3 +++
dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile | 3 +++
dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile | 3 +++
dev/tasks/linux-packages/debian/control | 3 +++
dev/tasks/linux-packages/debian/rules | 2 ++
5 files changed, 14 insertions(+)
diff --git a/dev/tasks/linux-packages/apt/debian-stretch/Dockerfile b/dev/tasks/linux-packages/apt/debian-stretch/Dockerfile
index b803727..fc14761 100644
--- a/dev/tasks/linux-packages/apt/debian-stretch/Dockerfile
+++ b/dev/tasks/linux-packages/apt/debian-stretch/Dockerfile
@@ -40,9 +40,12 @@ RUN \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
+ libprotobuf-dev \
+ libprotoc-dev \
lsb-release \
nvidia-cuda-toolkit \
pkg-config \
+ protobuf-compiler \
python3-dev \
python3-numpy && \
apt clean && \
diff --git a/dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile b/dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile
index e4362b7..2452bac 100644
--- a/dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile
+++ b/dev/tasks/linux-packages/apt/ubuntu-bionic/Dockerfile
@@ -38,9 +38,12 @@ RUN \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
+ libprotobuf-dev \
+ libprotoc-dev \
lsb-release \
nvidia-cuda-toolkit \
pkg-config \
+ protobuf-compiler \
python3-dev \
python3-numpy && \
apt clean && \
diff --git a/dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile b/dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile
index 8448b28..2449f28 100644
--- a/dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile
+++ b/dev/tasks/linux-packages/apt/ubuntu-xenial/Dockerfile
@@ -39,9 +39,12 @@ RUN \
libgirepository1.0-dev \
libglib2.0-doc \
libjemalloc-dev \
+ libprotobuf-dev \
+ libprotoc-dev \
lsb-release \
nvidia-cuda-toolkit \
pkg-config \
+ protobuf-compiler \
python3-dev \
python3-numpy && \
apt clean && \
diff --git a/dev/tasks/linux-packages/debian/control b/dev/tasks/linux-packages/debian/control
index 2534201..498596a 100644
--- a/dev/tasks/linux-packages/debian/control
+++ b/dev/tasks/linux-packages/debian/control
@@ -13,6 +13,9 @@ Build-Depends:
libboost-filesystem-dev,
libboost-regex-dev,
libjemalloc-dev,
+ libprotobuf-dev,
+ libprotoc-dev,
+ protobuf-compiler,
python3-dev,
python3-numpy,
nvidia-cuda-toolkit,
diff --git a/dev/tasks/linux-packages/debian/rules b/dev/tasks/linux-packages/debian/rules
index 0659bd8..955e9e2 100755
--- a/dev/tasks/linux-packages/debian/rules
+++ b/dev/tasks/linux-packages/debian/rules
@@ -27,6 +27,8 @@ override_dh_auto_configure:
-DARROW_PYTHON=ON \
-DARROW_BOOST_USE_SHARED=ON \
-DARROW_ORC=ON \
+ -DPROTOBUF_HOME=/usr \
+ -DARROW_PROTOBUF_USE_SHARED=ON \
-DPythonInterp_FIND_VERSION=ON \
-DPythonInterp_FIND_VERSION_MAJOR=3 \
-DARROW_GPU=ON