Kaydet (Commit) a164d246 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#50682: Setting DYLD_LIBRARY_PATH in python script appears unnecessary

...and apparently has negative consequences (system CFNetwork framework picking
up LO libsqlite3.dylib instead of system one, as DYLD_LIBRARY_PATH overrides
recorded installnames).

Contrary to the old comment ("so that 'import pyuno' finds libpyuno.so"), what
setting LD_LIBRARY_PATH on Linux is still necessary for is so that python.bin
(a stripped version of the python executable from external python module) finds
libpython2.6.so, as it lacks an RPATH.  ('import pyuno' finds pyuno.so
apparently on PYTHONPATH, anyway, and pyuno.so in turn dlopen's
libpython.{dylib,so} with full path.)

(This might make dc82cf02 "Make PyUNO work
--with-macox-version-min-required=10.6" irrelevant.)

Change-Id: I1c3a6c61d4cc976d85956e587497a13a77689128
üst 69419bca
......@@ -43,10 +43,6 @@ cd "$sd_cwd"
PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set %%OOO_LIBRARY_PATH_VAR%% so that "import pyuno" finds libpyuno.so:
%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
export %%OOO_LIBRARY_PATH_VAR%%
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
: ${UNO_PATH=$sd_prog}
export UNO_PATH
......@@ -57,6 +53,11 @@ export UNO_PATH
export URE_BOOTSTRAP
NONMACSECTION
# Set %%OOO_LIBRARY_PATH_VAR%% so that python.bin finds libpython2.6.so (this
# can go once python.bin contains a proper RPATH):
%%OOO_LIBRARY_PATH_VAR%%=$sd_prog${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
export %%OOO_LIBRARY_PATH_VAR%%
PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
PYTHONHOME=$sd_prog/python-core-%%PYVERSION%%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment