[arrow] branch master updated: ARROW-2326: [Python] Use @loader_path/ as rpath instead of @loader_path when bundling C++ libraries in wheels on macOS

[uw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uwe 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 f8cd36a  ARROW-2326: [Python] Use @loader_path/ as rpath instead of @loader_path when bundling C++ libraries in wheels on macOS
f8cd36a is described below

commit f8cd36aff2a698c3df933c17325a407151b55cd4
Author: Wes McKinney <we...@apache.org>
AuthorDate: Thu Jul 19 09:49:18 2018 +0200

    ARROW-2326: [Python] Use @loader_path/ as rpath instead of @loader_path when bundling C++ libraries in wheels on macOS
    
    See discussion in JIRA. I will try to build the wheel with crossbow and see if this resolves the issue
    
    Author: Wes McKinney <we...@apache.org>
    
    Closes #2291 from wesm/ARROW-2326 and squashes the following commits:
    
    126b29bd <Wes McKinney> Attempt fix for OS X 10.9 @loader_path issue
---
 python/CMakeLists.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index e99c2a7..306f041 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -457,15 +457,20 @@ foreach(module ${CYTHON_EXTENSIONS})
       # root of the pyarrow/ package so that libarrow/libarrow_python are able
       # to be loaded properly
       if(APPLE)
-        set(module_install_rpath "@loader_path")
+        set(module_install_rpath "@loader_path/")
       else()
         set(module_install_rpath "\$ORIGIN")
       endif()
-      list(LENGTH directories i)
-      while(${i} GREATER 0)
-        set(module_install_rpath "${module_install_rpath}/..")
-        math(EXPR i "${i} - 1" )
-      endwhile(${i} GREATER 0)
+
+      # XXX(wesm): ARROW-2326 this logic is only needed when we have Cython
+      # modules in interior directories. Since all of our C extensions and
+      # bundled libraries are in the same place, we can skip this part
+
+      # list(LENGTH directories i)
+      # while(${i} GREATER 0)
+      #   set(module_install_rpath "${module_install_rpath}/..")
+      #   math(EXPR i "${i} - 1" )
+      # endwhile(${i} GREATER 0)
 
       set_target_properties(${module_name} PROPERTIES
         INSTALL_RPATH ${module_install_rpath})