diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-19 15:33:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-19 16:16:34 +0200 |
| commit | b865ff3d75a4611eaefe1f35b0dc9c7d9256f1ff (patch) | |
| tree | 152ea51574bbd96d1be60ad617cd75dc36d6ae86 | |
| parent | 9dd52eb86a9122e34c307a9160ae3ccd5706c94e (diff) | |
python3: put an RPATH into python binary ...
... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.
Change-Id: I7d91c6086460504d656de7b018087264165f396b
| -rw-r--r-- | python3/UnpackedTarball_python3.mk | 6 | ||||
| -rw-r--r-- | python3/python-3.3.0-elf-rpath.patch.1 | 13 | ||||
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 1 | ||||
| -rw-r--r-- | pyuno/zipcore/nonmac.sh | 4 |
4 files changed, 19 insertions, 5 deletions
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 696c8691106d..0d5fce5e6236 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -40,4 +40,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ )) endif +ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + python3/python-3.3.0-elf-rpath.patch.1 \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/python3/python-3.3.0-elf-rpath.patch.1 b/python3/python-3.3.0-elf-rpath.patch.1 new file mode 100644 index 000000000000..0007d6b2e71e --- /dev/null +++ b/python3/python-3.3.0-elf-rpath.patch.1 @@ -0,0 +1,13 @@ +set RPATH (only to be used on ELF platforms) + +--- python3/Makefile.pre.in 2013-04-19 15:08:43.637715422 +0200 ++++ python3/Makefile.pre.in 2013-04-19 15:07:32.685711138 +0200 +@@ -464,7 +464,7 @@ + + # Build the interpreter + $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) +- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ++ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN + + platform: $(BUILDPYTHON) $(SYSCONFIGDATA) + $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index f4df015b8217..0f254bad43b1 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -47,7 +47,6 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ - -e "s/%%OOO_LIBRARY_PATH_VAR%%/$(gb_Helper_LIBRARY_PATH_VAR)/g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/pyuno/zipcore/nonmac.sh b/pyuno/zipcore/nonmac.sh index 0757b11fca0b..791a3404282a 100644 --- a/pyuno/zipcore/nonmac.sh +++ b/pyuno/zipcore/nonmac.sh @@ -1,7 +1,3 @@ -# 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 |