python3: put an RPATH into python binary ...

... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.

Change-Id: I7d91c6086460504d656de7b018087264165f396b
This commit is contained in:
Michael Stahl
2013-04-19 15:33:57 +02:00
parent 9dd52eb86a
commit b865ff3d75
4 changed files with 19 additions and 5 deletions

View File

@@ -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