diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-21 23:42:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-21 23:58:03 +0200 |
| commit | b078e0d638514b298616838fae090b8294bac32f (patch) | |
| tree | d586f1d11ba65670238433877876eaa076fada2f /external/python3/python-3.3.3-elf-rpath.patch.1 | |
| parent | 3d31cf66bb0c3f628cd175b50373f746ec45645f (diff) | |
python3: put a RPATH into libpython3.so
libpython3.so is the "ABI compatible" wrapper library around
libpython3.5m.so - it is not actually used by anything in LO right now,
but let's ensure it has RPATH $ORIGIN just in case.
This revealed that the AIX patch in python3 accidentally changed the
SONAME of libpython3.5m.so from upstream's libpython3.5m.so.1.0
on ELF platforms, because the SONAME variable was set in the shell
command but read as a make variable in the next line, which is actually
evaluated earlier.
So rename a few files in packages to use the upstream SONAME.
Change-Id: I3611f75eee62b0993b853230521a2fa41ac5cd9c
Diffstat (limited to 'external/python3/python-3.3.3-elf-rpath.patch.1')
| -rw-r--r-- | external/python3/python-3.3.3-elf-rpath.patch.1 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/external/python3/python-3.3.3-elf-rpath.patch.1 b/external/python3/python-3.3.3-elf-rpath.patch.1 index 945f7a52c690..029d98c0310d 100644 --- a/external/python3/python-3.3.3-elf-rpath.patch.1 +++ b/external/python3/python-3.3.3-elf-rpath.patch.1 @@ -1,5 +1,7 @@ set RPATH (only to be used on ELF platforms) +(currently nothing in LO actually links libpython3.so) + diff -ru python3.orig/Makefile.pre.in python3/Makefile.pre.in --- python3.orig/Makefile.pre.in 2015-07-26 20:29:07.126194320 +0200 +++ python3/Makefile.pre.in 2015-07-26 20:37:21.814227530 +0200 @@ -12,3 +14,15 @@ diff -ru python3.orig/Makefile.pre.in python3/Makefile.pre.in platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform +--- python3.orig/Makefile.pre.in 2015-07-05 18:50:07.000000000 +0200 ++++ python3/Makefile.pre.in 2015-07-26 17:34:00.386488960 +0200 +@@ -607,7 +607,7 @@ + fi + + libpython3.so: libpython$(LDVERSION).so +- $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ ++ $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ -Wl,-rpath,\$$ORIGIN + + libpython$(LDVERSION).dylib: $(LIBRARY_OBJS) + $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + |