diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-27 07:04:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-27 16:49:59 +0000 |
commit | 6f4cca64ba524f3bb7b076776e940befef11390e (patch) | |
tree | f85ed725ef9d95fcf877d8898ee248b4ab56cfa4 /community/python3-tkinter/musl-find_library.patch | |
parent | 63e2605b9bfa963e05166f5a1631fd9164600698 (diff) | |
download | aports-6f4cca64ba524f3bb7b076776e940befef11390e.tar.bz2 aports-6f4cca64ba524f3bb7b076776e940befef11390e.tar.xz |
main/python3: fix cyclic dependency for tkinter
Add a separate apkbuild for tkinter to avoid the cyclic buildtime
dependency:
python3 -> tk -> libX11 -> libxcb -> xcb-proto -> python3
Diffstat (limited to 'community/python3-tkinter/musl-find_library.patch')
-rw-r--r-- | community/python3-tkinter/musl-find_library.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/community/python3-tkinter/musl-find_library.patch b/community/python3-tkinter/musl-find_library.patch new file mode 100644 index 0000000000..7899abb736 --- /dev/null +++ b/community/python3-tkinter/musl-find_library.patch @@ -0,0 +1,45 @@ +diff -ru Python-2.7.12.orig/Lib/ctypes/util.py Python-2.7.12/Lib/ctypes/util.py +--- Python-2.7.12.orig/Lib/ctypes/util.py 2016-06-26 00:49:30.000000000 +0300 ++++ Python-2.7.12/Lib/ctypes/util.py 2016-11-03 16:05:46.954665040 +0200 +@@ -204,6 +204,41 @@ + def find_library(name, is64 = False): + return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name)) + ++ elif True: ++ ++ # Patched for Alpine Linux / musl - search manually system paths ++ def _is_elf(filepath): ++ try: ++ with open(filepath, 'rb') as fh: ++ return fh.read(4) == b'\x7fELF' ++ except: ++ return False ++ ++ def find_library(name): ++ from glob import glob ++ # absolute name? ++ if os.path.isabs(name): ++ return name ++ # special case for libm, libcrypt and libpthread and musl ++ if name in ['m', 'crypt', 'pthread']: ++ name = 'c' ++ elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']: ++ name = 'libc.so' ++ # search in standard locations (musl order) ++ paths = ['/lib', '/usr/local/lib', '/usr/lib'] ++ if 'LD_LIBRARY_PATH' in os.environ: ++ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths ++ for d in paths: ++ f = os.path.join(d, name) ++ if _is_elf(f): ++ return os.path.basename(f) ++ ++ prefix = os.path.join(d, 'lib'+name) ++ for suffix in ['.so', '.so.*']: ++ for f in glob('{0}{1}'.format(prefix, suffix)): ++ if _is_elf(f): ++ return os.path.basename(f) ++ + else: + + def _findSoname_ldconfig(name): |