Commit 16fad622 authored by Natanael Copa's avatar Natanael Copa

main/python: fix find_library

Bad things happens When libc is dlopened with full path so we only
return the filename without path with find_library.

fixes #5038
parent 7af26a35
......@@ -2,7 +2,7 @@
pkgname=python
pkgver=2.7.11
_verbase=${pkgver%.*}
pkgrel=2
pkgrel=3
pkgdesc="A high-level scripting language"
url="http://www.python.org"
arch="all"
......@@ -94,11 +94,11 @@ gdbm() {
}
md5sums="1dbcc848b4cd8399a8199d000f9f823c Python-2.7.11.tar.xz
23691939c584e8490948b4331927e4bc musl-find_library.patch
e2ea88671f8f838142323aedc417be48 musl-find_library.patch
dada786a50fa332686a9b9260d84c110 unchecked-ioctl.patch"
sha256sums="962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 Python-2.7.11.tar.xz
efb0e5312422494be03cfb89b52404d66796e3fd3c6ccb49b32917294d66d93e musl-find_library.patch
5a2ec65881816a80de25530a274aa3998684e02d82cff6565c08405df11983c0 musl-find_library.patch
f9d37609bab83d9ffff96ec9a33e16568cfb14980d389f7fe34a1c837397e359 unchecked-ioctl.patch"
sha512sums="72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0 Python-2.7.11.tar.xz
382e86e53f9d87c3e6b36c56f8296eab2f24a20ba1fb0a1fdcbe40f6bbb51c93ab03403499f7c9f6a33430eb69b81fc613d430a37880bde9fbe510503c409529 musl-find_library.patch
dbc1538d519997175ca24c8fcb94aa20924a9be3065a44fd7693ea7eb3642f681ea0b337b72074e17baf19966b7ee6dbac1081d40e2fdc11e30b6b8a6eeb577e musl-find_library.patch
5a8e013a4132d71c4360771f130d27b37275ae59330cf9a75378dc8a11236017f540eb224f2a148984e82ca3fb6b29129375b1080ba05b81044faa717520ab82 unchecked-ioctl.patch"
......@@ -27,13 +27,13 @@ index 1e882e3..b265cc0 100644
+ for d in paths:
+ f = os.path.join(d, name)
+ if _is_elf(f):
+ return f
+ return os.path.basename(f)
+
+ prefix = os.path.join(d, 'lib'+name)
+ for suffix in ['.so', '.so.*', '.*.so.*']:
+ for f in glob('{0}{1}'.format(prefix, suffix)):
+ if _is_elf(f):
+ return f
+ return os.path.basename(f)
+
def find_library(name):
- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
......
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