This is an automated email from the ASF dual-hosted git repository.
kszucs 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 de71982 ARROW-4322: [C++] Don't use _GLIBCXX_USE_CXX11_ABI=0 anymore
in docker scripts
de71982 is described below
commit de7198274a3a2c90af765d55838e4f4339bae84f
Author: Korn, Uwe <[email protected]>
AuthorDate: Tue Jan 22 17:22:48 2019 +0100
ARROW-4322: [C++] Don't use _GLIBCXX_USE_CXX11_ABI=0 anymore in docker
scripts
crossbow builds:
https://github.com/xhochy/crossbow/branches/all?utf8=%E2%9C%93&query=build-30
Author: Korn, Uwe <[email protected]>
Closes #3458 from xhochy/ARROW-4322 and squashes the following commits:
ebb3c57b <Korn, Uwe> Add R to nightly tests
7b4d7729 <Korn, Uwe> ARROW-4322: Don't use _GLIBCXX_USE_CXX11_ABI=0
anymore in docker scripts
---
ci/docker_build_c_glib.sh | 2 +-
ci/docker_build_cpp.sh | 3 ---
ci/docker_build_python.sh | 2 --
ci/docker_build_r.sh | 4 ----
dev/tasks/tests.yml | 10 ++++++++++
r/Dockerfile | 3 +--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ci/docker_build_c_glib.sh b/ci/docker_build_c_glib.sh
index 28ef901..0135781 100755
--- a/ci/docker_build_c_glib.sh
+++ b/ci/docker_build_c_glib.sh
@@ -22,7 +22,7 @@ set -e
export ARROW_C_GLIB_HOME=$CONDA_PREFIX
export CFLAGS="-DARROW_NO_DEPRECATED_API"
-export CXXFLAGS="-DARROW_NO_DEPRECATED_API -D_GLIBCXX_USE_CXX11_ABI=0"
+export CXXFLAGS="-DARROW_NO_DEPRECATED_API"
mkdir -p /build/c_glib
diff --git a/ci/docker_build_cpp.sh b/ci/docker_build_cpp.sh
index c6a46f2..2662704 100755
--- a/ci/docker_build_cpp.sh
+++ b/ci/docker_build_cpp.sh
@@ -23,9 +23,6 @@ source_dir=${1:-/arrow/cpp}
build_dir=${2:-/build/cpp}
install_dir=${3:-${ARROW_HOME:-/usr/local}}
-# https://arrow.apache.org/docs/python/development.html#known-issues
-export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
-
mkdir -p ${build_dir}
pushd ${build_dir}
diff --git a/ci/docker_build_python.sh b/ci/docker_build_python.sh
index 23d852b..801c50c 100755
--- a/ci/docker_build_python.sh
+++ b/ci/docker_build_python.sh
@@ -21,8 +21,6 @@ set -e
source_dir=${1:-/arrow/python}
build_dir=${2:-/build/python}
-# For newer GCC per
https://arrow.apache.org/docs/python/development.html#known-issues
-export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
export PYARROW_CXXFLAGS=$CXXFLAGS
export PYARROW_CMAKE_GENERATOR=Ninja
export PYARROW_BUILD_TYPE=${PYARROW_BUILD_TYPE:-debug}
diff --git a/ci/docker_build_r.sh b/ci/docker_build_r.sh
index 9fb95bc..6e67678 100755
--- a/ci/docker_build_r.sh
+++ b/ci/docker_build_r.sh
@@ -21,10 +21,6 @@ set -e
export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export ARROW_HOME=$CONDA_PREFIX
-# For newer GCC per
https://arrow.apache.org/docs/python/development.html#known-issues
-export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
-export PKG_CXXFLAGS=$CXXFLAGS
-
# Build arrow
pushd /arrow/r
diff --git a/dev/tasks/tests.yml b/dev/tasks/tests.yml
index a0c7676..efb24ca 100644
--- a/dev/tasks/tests.yml
+++ b/dev/tasks/tests.yml
@@ -19,6 +19,7 @@ groups:
# these groups are just for convenience
# makes it easier to submit related tasks
docker:
+ - docker-r
- docker-rust
- docker-cpp
- docker-cpp-alpine
@@ -67,6 +68,15 @@ tasks:
############################## Language containers #########################
+ docker-r:
+ platform: linux
+ template: docker-tests/travis.linux.yml
+ params:
+ commands:
+ - docker-compose build cpp
+ - docker-compose build r
+ - docker-compose run r
+
docker-rust:
platform: linux
template: docker-tests/travis.linux.yml
diff --git a/r/Dockerfile b/r/Dockerfile
index a357bcc..88cc21e 100644
--- a/r/Dockerfile
+++ b/r/Dockerfile
@@ -68,9 +68,8 @@ RUN apt update && \
repos = 'http://cran.rstudio.com')"
# Tell R where it can find the source code for arrow
-ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow
+ENV
PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/build/cpp/src/arrow:/opt/conda/lib/pkgconfig
ENV LD_LIBRARY_PATH=/opt/conda/lib/:/build/cpp/src/arrow:/arrow/r/src
-ENV CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
# build, install, test R package
CMD /arrow/ci/docker_build_cpp.sh && \
