arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-223: Do not link against libpython
Date Tue, 21 Jun 2016 22:11:36 GMT
Repository: arrow
Updated Branches:
  refs/heads/master a3e3849cd -> f7ade7bfe


ARROW-223: Do not link against libpython

Author: Uwe L. Korn <uwelk@xhochy.com>

Closes #95 from xhochy/arrow-223 and squashes the following commits:

4fdf1e7 [Uwe L. Korn] ARROW-223: Do not link against libpython

Change-Id: I1238a48aaf94ab175b367551f74c335c6455d78a


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/f7ade7bf
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/f7ade7bf
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/f7ade7bf

Branch: refs/heads/master
Commit: f7ade7bfeaa7e0d7fb3dd9d5a93e29a413cc142a
Parents: a3e3849
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Tue Jun 21 15:11:26 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Tue Jun 21 15:11:26 2016 -0700

----------------------------------------------------------------------
 python/cmake_modules/FindPythonLibsNew.cmake | 6 +++++-
 python/cmake_modules/UseCython.cmake         | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/f7ade7bf/python/cmake_modules/FindPythonLibsNew.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/FindPythonLibsNew.cmake b/python/cmake_modules/FindPythonLibsNew.cmake
index 0f2295a..5cb65c9 100644
--- a/python/cmake_modules/FindPythonLibsNew.cmake
+++ b/python/cmake_modules/FindPythonLibsNew.cmake
@@ -224,7 +224,11 @@ FUNCTION(PYTHON_ADD_MODULE _NAME )
       SET_TARGET_PROPERTIES(${_NAME} PROPERTIES LINK_FLAGS
                           "-undefined dynamic_lookup")
     ELSE()
-      TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
+     # In general, we should not link against libpython as we do not embed
+     # the Python interpreter. The python binary itself can then define where
+     # the symbols should loaded from.
+     SET_TARGET_PROPERTIES(${_NAME} PROPERTIES LINK_FLAGS
+         "-Wl,-undefined,dynamic_lookup")
     ENDIF()
     IF(PYTHON_MODULE_${_NAME}_BUILD_SHARED)
       SET_TARGET_PROPERTIES(${_NAME} PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")

http://git-wip-us.apache.org/repos/asf/arrow/blob/f7ade7bf/python/cmake_modules/UseCython.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/UseCython.cmake b/python/cmake_modules/UseCython.cmake
index 3b1c201..cee6066 100644
--- a/python/cmake_modules/UseCython.cmake
+++ b/python/cmake_modules/UseCython.cmake
@@ -163,7 +163,6 @@ function( cython_add_module _name pyx_target_name generated_files)
   include_directories( ${PYTHON_INCLUDE_DIRS} )
   python_add_module( ${_name} ${_generated_files} ${other_module_sources} )
   add_dependencies( ${_name} ${pyx_target_name})
-  target_link_libraries( ${_name} ${PYTHON_LIBRARIES} )
 endfunction()
 
 include( CMakeParseArguments )


Mime
View raw message