Skip to content

Commit

Permalink
Fix rpath issues per ARROW-53
Browse files Browse the repository at this point in the history
  • Loading branch information
wesm committed Mar 9, 2016
1 parent 7554539 commit cae9b39
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ matrix:
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
- compiler: clang
language: cpp
language: objective-c
osx_image: xcode6.4
os: osx
addons:
before_script:
Expand All @@ -40,7 +41,6 @@ before_install:
- ulimit -c unlimited -S
- export CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build
- export ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install
- export LD_LIBRARY_PATH=$ARROW_CPP_INSTALL/lib:$LD_LIBRARY_PATH

after_script:
- rm -rf $CPP_BUILD_DIR
Expand Down
5 changes: 3 additions & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,11 @@ set(LINK_LIBS
arrow
)

SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

add_library(pyarrow SHARED
${PYARROW_SRCS})
target_link_libraries(pyarrow ${LINK_LIBS})
set_target_properties(pyarrow PROPERTIES LINKER_LANGUAGE CXX)

if(APPLE)
set_target_properties(pyarrow PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
Expand Down Expand Up @@ -473,7 +474,7 @@ foreach(module ${CYTHON_EXTENSIONS})
endwhile(${i} GREATER 0)

# for inplace development for now
# set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")
#set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")

set_target_properties(${module_name} PROPERTIES
INSTALL_RPATH ${module_install_rpath})
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ def get_outputs(self):
name="pyarrow",
packages=['pyarrow', 'pyarrow.tests'],
version=VERSION,
zip_safe=False,
package_data={'pyarrow': ['*.pxd', '*.pyx']},

# Dummy extension to trigger build_ext
ext_modules=[Extension('__dummy__', sources=[])],

Expand Down

0 comments on commit cae9b39

Please sign in to comment.