U1DB

Merge lp:~dobey/u1db/python-rpath into lp:u1db

  1. python-rpath
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 443
Merged at revision: 443
Proposed branch: lp:~dobey/u1db/python-rpath
Merge into: lp:u1db
Diff against target: 27 lines (+3/-3)
1 file modified
CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~dobey/u1db/python-rpath
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+179021@code.launchpad.net

Commit message

Use the rpath option to setup.py build_ext, so the compiled cython module
can be loaded without LD_PRELOAD or LD_LIBRARY_PATH tweaking.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-10-18 21:47:53 +0000
3+++ CMakeLists.txt 2013-08-07 17:27:27 +0000
4@@ -55,12 +55,12 @@
5 )
6
7 add_custom_target(build-inplace-for-tests
8- COMMAND U1DB_TEST=1 python setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include
9+ COMMAND U1DB_TEST=1 python setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include -R ${CMAKE_BINARY_DIR}/src
10 DEPENDS ReplicatePythonSourceTree u1db
11 )
12
13 add_custom_target(build-debug-for-tests
14- COMMAND U1DB_TEST=1 python-dbg setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include
15+ COMMAND U1DB_TEST=1 python-dbg setup.py build_ext -i -f -I ${CMAKE_SOURCE_DIR}/include -R ${CMAKE_BINARY_DIR}/src
16 DEPENDS ReplicatePythonSourceTree u1db
17 )
18 add_custom_target(check-valgrind
19@@ -88,7 +88,7 @@
20
21 add_custom_target(install-python ALL
22 # Do NOT build this one in-place
23- COMMAND python setup.py build_ext -f -I ${CMAKE_SOURCE_DIR}/include
24+ COMMAND python setup.py build_ext -f -I ${CMAKE_SOURCE_DIR}/include -R ${CMAKE_BINARY_DIR}/src
25 COMMAND python setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=${CMAKE_CURRENT_BINARY_DIR}/temp
26 DEPENDS ReplicatePythonSourceTree u1db
27 )

Subscribers

People subscribed via source and target branches