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 7b2c797 ARROW-2349: [Python] Opt in to bundling Boost shared
libraries separately
7b2c797 is described below
commit 7b2c79765cf92760e1f8cca079159d9613b86412
Author: Wes McKinney <[email protected]>
AuthorDate: Sat Mar 24 00:55:39 2018 -0400
ARROW-2349: [Python] Opt in to bundling Boost shared libraries separately
In the scenario that the following are true, this prevents issues in the
following case:
* Arrow libraries built with static Boost linking, and we pass
`--with-static-boost` to setup.py
* Arrow libraries being bundled `--bundle-arrow-cpp`
* Boost libraries cannot be found when building pyarrow
Right now if `--bundle-arrow-cpp` is passed, then
`-DPYARROW_BUNDLE_BOOST=ON` is passed to CMake.
Related to issues in https://github.com/apache/arrow-dist/pull/23
Author: Wes McKinney <[email protected]>
Closes #1786 from wesm/ARROW-2349 and squashes the following commits:
4b5d13e <Wes McKinney> Opt in to bundling Boost separately
---
python/CMakeLists.txt | 2 +-
python/setup.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 44a3c6c..cb3cd70 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -78,7 +78,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL
"${CMAKE_CURRENT_SOURCE_DIR}")
OFF)
option(PYARROW_BUNDLE_BOOST
"Bundle the Boost libraries when we bundle Arrow C++"
- ON)
+ OFF)
set(PYARROW_CXXFLAGS "" CACHE STRING
"Compiler flags to append when compiling Arrow")
endif()
diff --git a/python/setup.py b/python/setup.py
index 4724690..91e0bb9 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -136,7 +136,7 @@ class build_ext(_build_ext):
# Default is True but this only is actually bundled when
# we also bundle arrow-cpp.
self.bundle_boost = strtobool(
- os.environ.get('PYARROW_BUNDLE_BOOST', '1'))
+ os.environ.get('PYARROW_BUNDLE_BOOST', '0'))
CYTHON_MODULE_NAMES = [
'lib',
@@ -195,15 +195,15 @@ class build_ext(_build_ext):
if self.bundle_arrow_cpp:
cmake_options.append('-DPYARROW_BUNDLE_ARROW_CPP=ON')
- cmake_options.append('-DPYARROW_BUNDLE_BOOST=ON')
# ARROW-1090: work around CMake rough edges
if 'ARROW_HOME' in os.environ and sys.platform != 'win32':
pkg_config = pjoin(os.environ['ARROW_HOME'], 'lib',
'pkgconfig')
os.environ['PKG_CONFIG_PATH'] = pkg_config
del os.environ['ARROW_HOME']
- else:
- cmake_options.append('-DPYARROW_BUNDLE_BOOST=OFF')
+
+ if self.bundle_boost:
+ cmake_options.append('-DPYARROW_BUNDLE_BOOST=ON')
cmake_options.append('-DCMAKE_BUILD_TYPE={0}'
.format(self.build_type.lower()))
--
To stop receiving notification emails like this one, please contact
[email protected].
