Skip to content

ARROW-334: [Python] Remove INSTALL_RPATH_USE_LINK_PATH #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 6 commits into from
Closed

ARROW-334: [Python] Remove INSTALL_RPATH_USE_LINK_PATH #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
afb1dc0
Remove INSTALL_RPATH_USE_LINK_PATH
wesm Oct 12, 2016
30488d7
Don't conda install arrow-cpp during Travis build
wesm Oct 12, 2016
3c8d2dd
Clean up Travis CI scripts a bit. Put in LD_LIBRARY_PATH
wesm Oct 12, 2016
b76b7ac
Fix LD_LIBRARY_PATH
wesm Oct 13, 2016
b8224ce
Escape dollar sign in ORIGIN
wesm Oct 17, 2016
ed8fa39
Switch by to xcode 6.4
wesm Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ matrix:
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
- compiler: clang
language: objective-c
osx_image: xcode6.4
os: osx
addons:
Expand Down
4 changes: 0 additions & 4 deletions ci/travis_before_script_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@

set -ex

source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
conda install -y --channel apache/channel/dev parquet-cpp
export PARQUET_HOME=$MINICONDA

: ${CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build}

mkdir $CPP_BUILD_DIR
Expand Down
15 changes: 6 additions & 9 deletions ci/travis_script_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@

set -e

source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh

PYTHON_DIR=$TRAVIS_BUILD_DIR/python

# Re-use conda installation from C++
export MINICONDA=$HOME/miniconda
export PATH="$MINICONDA/bin:$PATH"
export PARQUET_HOME=$MINICONDA

export ARROW_HOME=$ARROW_CPP_INSTALL
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib

pushd $PYTHON_DIR

Expand All @@ -38,17 +42,10 @@ python_version_tests() {
# Expensive dependencies install from Continuum package repo
conda install -y pip numpy pandas cython

# conda install -y parquet-cpp

conda install -y arrow-cpp -c apache/channel/dev

# Other stuff pip install
pip install -r requirements.txt

export ARROW_HOME=$ARROW_CPP_INSTALL

python setup.py build_ext \
--inplace
python setup.py build_ext --inplace

python -m pytest -vv -r sxX pyarrow

Expand Down
4 changes: 1 addition & 3 deletions python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,6 @@ if (UNIX)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()

SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

add_subdirectory(src/pyarrow)
Copy link
Member

@xhochy xhochy Oct 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this really have an effect? Reading the documentation for CMAKE_BUILD_WITH_INSTALL_RPATH above it seems like they affect each other a bit.

Copy link
Member Author

@wesm wesm Oct 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the failing build -- the INSTALL_RPATH is being discarded

add_subdirectory(src/pyarrow/util)

Expand Down Expand Up @@ -494,7 +492,7 @@ foreach(module ${CYTHON_EXTENSIONS})
if(APPLE)
set(module_install_rpath "@loader_path")
else()
set(module_install_rpath "$ORIGIN")
set(module_install_rpath "\$ORIGIN")
endif()
list(LENGTH directories i)
while(${i} GREATER 0)
Expand Down