kou closed pull request #24: Package .deb and .rpm for 0.9.0
URL: https://github.com/apache/arrow-dist/pull/24
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/arrow b/arrow
index 1d689e5..c695a5d 160000
--- a/arrow
+++ b/arrow
@@ -1 +1 @@
-Subproject commit 1d689e5a3e417d3a4b3de16fea7a6fe195c8f8df
+Subproject commit c695a5ddc8d26c977b5ecd0c55212e900726953e
diff --git a/cpp-linux/apt/debian-stretch/Dockerfile
b/cpp-linux/apt/debian-stretch/Dockerfile
index 815349f..b803727 100644
--- a/cpp-linux/apt/debian-stretch/Dockerfile
+++ b/cpp-linux/apt/debian-stretch/Dockerfile
@@ -35,6 +35,7 @@ RUN \
git \
gtk-doc-tools \
libboost-filesystem-dev \
+ libboost-regex-dev \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
diff --git a/cpp-linux/apt/descriptor.json b/cpp-linux/apt/descriptor.json
index cc94323..27a1eae 100644
--- a/cpp-linux/apt/descriptor.json
+++ b/cpp-linux/apt/descriptor.json
@@ -7,7 +7,7 @@
"vcs_url": "htttps://github.com/apache/arrow.git"
},
"version": {
- "name": "0.8.0"
+ "name": "0.9.0"
},
"files": [
{
diff --git a/cpp-linux/apt/ubuntu-artful/Dockerfile
b/cpp-linux/apt/ubuntu-artful/Dockerfile
index 9cf779b..d953000 100644
--- a/cpp-linux/apt/ubuntu-artful/Dockerfile
+++ b/cpp-linux/apt/ubuntu-artful/Dockerfile
@@ -33,6 +33,7 @@ RUN \
git \
gtk-doc-tools \
libboost-filesystem-dev \
+ libboost-regex-dev \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
diff --git a/cpp-linux/apt/ubuntu-trusty/Dockerfile
b/cpp-linux/apt/ubuntu-trusty/Dockerfile
index f993458..dcb343b 100644
--- a/cpp-linux/apt/ubuntu-trusty/Dockerfile
+++ b/cpp-linux/apt/ubuntu-trusty/Dockerfile
@@ -32,6 +32,7 @@ RUN \
git \
gtk-doc-tools \
libboost-filesystem-dev \
+ libboost-regex-dev \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
diff --git a/cpp-linux/apt/ubuntu-xenial/Dockerfile
b/cpp-linux/apt/ubuntu-xenial/Dockerfile
index 86dc7d3..8448b28 100644
--- a/cpp-linux/apt/ubuntu-xenial/Dockerfile
+++ b/cpp-linux/apt/ubuntu-xenial/Dockerfile
@@ -34,6 +34,7 @@ RUN \
git \
gtk-doc-tools \
libboost-filesystem-dev \
+ libboost-regex-dev \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
diff --git a/cpp-linux/debian.ubuntu-trusty/changelog
b/cpp-linux/debian.ubuntu-trusty/changelog
index 9b54c39..ebfe935 100644
--- a/cpp-linux/debian.ubuntu-trusty/changelog
+++ b/cpp-linux/debian.ubuntu-trusty/changelog
@@ -1,3 +1,9 @@
+apache-arrow (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Kouhei Sutou <k...@clear-code.com> Fri, 16 Mar 2018 16:56:31 -0000
+
apache-arrow (0.8.0-2) unstable; urgency=low
* Fix .typelib path.
diff --git a/cpp-linux/debian.ubuntu-trusty/control
b/cpp-linux/debian.ubuntu-trusty/control
index aa0571d..9732ebd 100644
--- a/cpp-linux/debian.ubuntu-trusty/control
+++ b/cpp-linux/debian.ubuntu-trusty/control
@@ -9,6 +9,7 @@ Build-Depends:
git,
libboost-system-dev,
libboost-filesystem-dev,
+ libboost-regex-dev,
libjemalloc-dev,
libgirepository1.0-dev,
gtk-doc-tools,
diff --git a/cpp-linux/debian.ubuntu-trusty/rules
b/cpp-linux/debian.ubuntu-trusty/rules
index 17f3378..783b7a7 100755
--- a/cpp-linux/debian.ubuntu-trusty/rules
+++ b/cpp-linux/debian.ubuntu-trusty/rules
@@ -17,7 +17,8 @@ override_dh_auto_configure:
--builddirectory=cpp_build \
-- \
-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
- -DARROW_BUILD_TESTS=OFF
+ -DARROW_BUILD_TESTS=OFF \
+ -DARROW_ORC=ON
dh_auto_configure \
--sourcedirectory=c_glib \
--builddirectory=c_glib_build \
diff --git a/cpp-linux/debian/changelog b/cpp-linux/debian/changelog
index 691acb7..9e7a2ee 100644
--- a/cpp-linux/debian/changelog
+++ b/cpp-linux/debian/changelog
@@ -1,3 +1,9 @@
+apache-arrow (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Kouhei Sutou <k...@clear-code.com> Fri, 16 Mar 2018 16:56:31 -0000
+
apache-arrow (0.8.0-1) unstable; urgency=low
* New upstream release.
diff --git a/cpp-linux/debian/control b/cpp-linux/debian/control
index 5b3fa6f..2534201 100644
--- a/cpp-linux/debian/control
+++ b/cpp-linux/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
git,
libboost-system-dev,
libboost-filesystem-dev,
+ libboost-regex-dev,
libjemalloc-dev,
python3-dev,
python3-numpy,
diff --git
a/cpp-linux/debian/patches/0001-ARROW-1933-GLib-Fix-build-error-with-with-arrow-cpp-.patch
b/cpp-linux/debian/patches/0001-ARROW-1933-GLib-Fix-build-error-with-with-arrow-cpp-.patch
deleted file mode 100644
index 802b27b..0000000
---
a/cpp-linux/debian/patches/0001-ARROW-1933-GLib-Fix-build-error-with-with-arrow-cpp-.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 72e660a7c90f1846eac473c21fb718a2e23c476e Mon Sep 17 00:00:00 2001
-From: Kouhei Sutou <k...@clear-code.com>
-Date: Mon, 18 Dec 2017 16:52:22 +0100
-Subject: [PATCH] ARROW-1933: [GLib] Fix build error with
- --with-arrow-cpp-build-dir
-
-The option is used in building deb package.
-
-`arrow/gpu/cuda_version.h` exists in build directory not source directory.
-
-Author: Kouhei Sutou <k...@clear-code.com>
-
-Closes #1429 from kou/glib-fix-build-error-with-arrow-cpp-build-dir and
squashes the following commits:
-
-879d6bc [Kouhei Sutou] [GLib] Fix build error with --with-arrow-cpp-build-dir
----
- c_glib/arrow-glib/Makefile.am | 4 ++++
- c_glib/arrow-gpu-glib/Makefile.am | 13 ++++++++++++-
- c_glib/configure.ac | 18 +++++++++++++++---
- c_glib/example/Makefile.am | 4 ++++
- 4 files changed, 35 insertions(+), 4 deletions(-)
-
-diff --git a/c_glib/arrow-glib/Makefile.am b/c_glib/arrow-glib/Makefile.am
-index 39222a54..16d07031 100644
---- a/c_glib/arrow-glib/Makefile.am
-+++ b/c_glib/arrow-glib/Makefile.am
-@@ -212,6 +212,10 @@ if HAVE_INTROSPECTION
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ARGS =
- INTROSPECTION_SCANNER_ENV =
-+if USE_ARROW_BUILD_DIR
-+INTROSPECTION_SCANNER_ENV += \
-+ LD_LIBRARY_PATH=$(ARROW_LIB_DIR):$${PKG_CONFIG_PATH}
-+endif
- if OS_MACOS
- INTROSPECTION_SCANNER_ENV += \
- ARCHFLAGS=
-diff --git a/c_glib/arrow-gpu-glib/Makefile.am
b/c_glib/arrow-gpu-glib/Makefile.am
-index 11ffa5ec..1e1c02ac 100644
---- a/c_glib/arrow-gpu-glib/Makefile.am
-+++ b/c_glib/arrow-gpu-glib/Makefile.am
-@@ -70,8 +70,14 @@ if HAVE_INTROSPECTION
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ARGS =
--INTROSPECTION_SCANNER_ENV = \
-+INTROSPECTION_SCANNER_ENV =
-+if USE_ARROW_BUILD_DIR
-+INTROSPECTION_SCANNER_ENV += \
-+
PKG_CONFIG_PATH=${abs_builddir}/../arrow-glib:$(ARROW_BUILD_DIR)/src/arrow:$${PKG_CONFIG_PATH}
-+else
-+INTROSPECTION_SCANNER_ENV += \
- PKG_CONFIG_PATH=${abs_builddir}/../arrow-glib:$${PKG_CONFIG_PATH}
-+endif
- if OS_MACOS
- INTROSPECTION_SCANNER_ENV += \
- ARCHFLAGS=
-@@ -88,6 +94,11 @@ ArrowGPU_1_0_gir_INCLUDES = \
- Arrow-1.0
- ArrowGPU_1_0_gir_CFLAGS = \
- $(AM_CPPFLAGS)
-+ArrowGPU_1_0_gir_LDFLAGS =
-+if USE_ARROW_BUILD_DIR
-+ArrowGPU_1_0_gir_LDFLAGS += \
-+ -L$(ARROW_LIB_DIR)
-+endif
- ArrowGPU_1_0_gir_LIBS = \
- $(abs_builddir)/../arrow-glib/libarrow-glib.la \
- libarrow-gpu-glib.la
-diff --git a/c_glib/configure.ac b/c_glib/configure.ac
-index f06a017a..eabe7bad 100644
---- a/c_glib/configure.ac
-+++ b/c_glib/configure.ac
-@@ -89,16 +89,25 @@ AC_ARG_WITH(arrow-cpp-build-dir,
- [GARROW_ARROW_CPP_BUILD_DIR="$withval"],
- [GARROW_ARROW_CPP_BUILD_DIR=""])
- if test "x$GARROW_ARROW_CPP_BUILD_DIR" = "x"; then
-+ USE_ARROW_BUILD_DIR=no
-+
- PKG_CHECK_MODULES([ARROW], [arrow arrow-compute])
- PKG_CHECK_MODULES([ARROW_GPU],
- [arrow-gpu],
- [HAVE_ARROW_GPU=yes],
- [HAVE_ARROW_GPU=no])
- else
-- ARROW_INCLUDE_DIR="\$(abs_top_srcdir)/../cpp/src"
-- ARROW_LIB_DIR="${GARROW_ARROW_CPP_BUILD_DIR}/${GARROW_ARROW_CPP_BUILD_TYPE}"
-+ USE_ARROW_BUILD_DIR=yes
-
-- ARROW_CFLAGS="-I${ARROW_INCLUDE_DIR}"
-+ ARROW_BUILD_DIR="${GARROW_ARROW_CPP_BUILD_DIR}"
-+ AC_SUBST(ARROW_BUILD_DIR)
-+
-+ ARROW_SOURCE_INCLUDE_DIR="\$(abs_top_srcdir)/../cpp/src"
-+ ARROW_BUILD_INCLUDE_DIR="${GARROW_ARROW_CPP_BUILD_DIR}/src"
-+ ARROW_LIB_DIR="${GARROW_ARROW_CPP_BUILD_DIR}/${GARROW_ARROW_CPP_BUILD_TYPE}"
-+ AC_SUBST(ARROW_LIB_DIR)
-+
-+ ARROW_CFLAGS="-I${ARROW_BUILD_INCLUDE_DIR} -I${ARROW_SOURCE_INCLUDE_DIR}"
- ARROW_LIBS="-L${ARROW_LIB_DIR} -larrow"
- AC_SUBST(ARROW_CFLAGS)
- AC_SUBST(ARROW_LIBS)
-@@ -115,6 +124,9 @@ else
- AC_SUBST(ARROW_GPU_LIBS)
- fi
-
-+AM_CONDITIONAL([USE_ARROW_BUILD_DIR],
-+ [test "$USE_ARROW_BUILD_DIR" = "yes"])
-+
- AM_CONDITIONAL([HAVE_ARROW_GPU], [test "$HAVE_ARROW_GPU" = "yes"])
- if test "$HAVE_ARROW_GPU" = "yes"; then
- AC_DEFINE(HAVE_ARROW_GPU, [1], [Define to 1 if Apache Arrow supports GPU.])
-diff --git a/c_glib/example/Makefile.am b/c_glib/example/Makefile.am
-index 3eaf808b..f4aca70c 100644
---- a/c_glib/example/Makefile.am
-+++ b/c_glib/example/Makefile.am
-@@ -33,6 +33,10 @@ AM_CFLAGS = \
- AM_LDFLAGS = \
- $(GLIB_LIBS) \
- $(builddir)/../arrow-glib/libarrow-glib.la
-+if USE_ARROW_BUILD_DIR
-+AM_LDFLAGS += \
-+ $(ARROW_LIBS)
-+endif
-
- noinst_PROGRAMS = \
- build \
---
-2.15.1
-
diff --git a/cpp-linux/debian/patches/series b/cpp-linux/debian/patches/series
index bfc6620..e69de29 100644
--- a/cpp-linux/debian/patches/series
+++ b/cpp-linux/debian/patches/series
@@ -1 +0,0 @@
-0001-ARROW-1933-GLib-Fix-build-error-with-with-arrow-cpp-.patch
diff --git a/cpp-linux/debian/rules b/cpp-linux/debian/rules
index 036ba8a..3655b38 100755
--- a/cpp-linux/debian/rules
+++ b/cpp-linux/debian/rules
@@ -25,6 +25,7 @@ override_dh_auto_configure:
-DARROW_PYTHON=ON \
-DPythonInterp_FIND_VERSION=ON \
-DPythonInterp_FIND_VERSION_MAJOR=3 \
+ -DARROW_ORC=ON \
-DARROW_GPU=ON
dh_auto_configure \
--sourcedirectory=c_glib \
diff --git a/cpp-linux/yum/arrow.spec.in b/cpp-linux/yum/arrow.spec.in
index 85405d3..013aaec 100644
--- a/cpp-linux/yum/arrow.spec.in
+++ b/cpp-linux/yum/arrow.spec.in
@@ -19,7 +19,7 @@
%define _centos_ver %{?centos_ver:%{centos_ver}}%{!?centos_ver:7}
-%define use_python %{_centos_ver} >= 7
+%define use_python %{_centos_ver} >= 6
%define use_glib %{_centos_ver} >= 7
Name: @PACKAGE@
@@ -40,8 +40,8 @@ BuildRequires: boost-devel
BuildRequires: git
BuildRequires: jemalloc-devel
%if %{use_python}
-BuildRequires: python-devel
-BuildRequires: numpy
+BuildRequires: python34-devel
+BuildRequires: python34-numpy
%endif
%if %{use_glib}
BuildRequires: gtk-doc
@@ -61,12 +61,15 @@ cd cpp/build
%cmake3 .. \
-DCMAKE_BUILD_TYPE=$build_type \
%if %{use_python}
- -DARROW_PYTHON=yes \
+ -DARROW_PYTHON=ON \
+ -DPythonInterp_FIND_VERSION=ON \
+ -DPythonInterp_FIND_VERSION_MAJOR=3 \
%endif
%if %{_centos_ver} == 6
- -DARROW_BOOST_VENDORED=yes \
+ -DARROW_BOOST_VENDORED=ON \
%endif
- -DARROW_BUILD_TESTS=no
+ -DARROW_ORC=ON \
+ -DARROW_BUILD_TESTS=OFF
make %{?_smp_mflags}
cd -
@@ -100,6 +103,7 @@ Group: System Environment/Libraries
License: Apache-2.0
Requires: boost-system
Requires: boost-filesystem
+Requires: boost-regex
Requires: jemalloc
%description libs
@@ -134,7 +138,7 @@ Summary: Apache Arrow CPython extensions
Group: System Environment/Libraries
License: Apache-2.0
Requires: arrow-libs = %{version}-%{release}
-Requires: python2
+Requires: python34-numpy
%description python-libs
This package contains the Apache Arrow CPython extensions.
@@ -150,7 +154,7 @@ Group: Development/Libraries
License: Apache-2.0
Requires: arrow-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
-Requires: python-devel
+Requires: python34-devel
%description python-devel
Libraries and header files for Apache Arrow CPython extensions.
@@ -220,6 +224,9 @@ Documentation for Apache Arrow GLib.
%endif
%changelog
+* Fri Mar 16 2018 Kouhei Sutou <k...@clear-code.com> - 0.9.0-1
+- New upstream release.
+
* Sun Dec 17 2017 Uwe Korn <uw...@xhochy.com> - 0.8.0-1
- New upstream release.
diff --git a/cpp-linux/yum/centos-6/Dockerfile
b/cpp-linux/yum/centos-6/Dockerfile
index 1f98d79..90bd710 100644
--- a/cpp-linux/yum/centos-6/Dockerfile
+++ b/cpp-linux/yum/centos-6/Dockerfile
@@ -52,10 +52,10 @@ RUN \
gobject-introspection-devel \
gtk-doc \
jemalloc-devel \
- numpy \
pkg-config \
- python \
- python-devel \
+ python34 \
+ python34-devel \
+ python34-numpy \
rpm-build \
rpmdevtools \
tar && \
diff --git a/cpp-linux/yum/centos-7/Dockerfile
b/cpp-linux/yum/centos-7/Dockerfile
index f4cc61e..58058ee 100644
--- a/cpp-linux/yum/centos-7/Dockerfile
+++ b/cpp-linux/yum/centos-7/Dockerfile
@@ -31,10 +31,10 @@ RUN \
gobject-introspection-devel \
gtk-doc \
jemalloc-devel \
- numpy \
pkg-config \
- python \
- python-devel \
+ python34 \
+ python34-devel \
+ python34-numpy \
rpm-build \
rpmdevtools \
tar && \
diff --git a/cpp-linux/yum/descriptor.json b/cpp-linux/yum/descriptor.json
index 2c0ea47..f59ef85 100644
--- a/cpp-linux/yum/descriptor.json
+++ b/cpp-linux/yum/descriptor.json
@@ -7,7 +7,7 @@
"vcs_url": "htttps://github.com/apache/arrow.git"
},
"version": {
- "name": "0.8.0"
+ "name": "0.9.0"
},
"files": [
{
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
