101 lines
3.6 KiB
Diff
101 lines
3.6 KiB
Diff
|
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frederik Rietdijk <fridh@fridh.nl>
|
||
|
|
Date: Mon, 28 Aug 2017 09:24:06 +0200
|
||
|
|
Subject: [PATCH] Don't use ldconfig
|
||
|
|
|
||
|
|
---
|
||
|
|
Lib/ctypes/util.py | 70 ++----------------------------------------------------
|
||
|
|
1 file changed, 2 insertions(+), 68 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
||
|
|
index 5e8b31a854..7b45ce6c15 100644
|
||
|
|
--- a/Lib/ctypes/util.py
|
||
|
|
+++ b/Lib/ctypes/util.py
|
||
|
|
@@ -94,46 +94,7 @@ elif os.name == "posix":
|
||
|
|
import re, tempfile
|
||
|
|
|
||
|
|
def _findLib_gcc(name):
|
||
|
|
- # Run GCC's linker with the -t (aka --trace) option and examine the
|
||
|
|
- # library name it prints out. The GCC command will fail because we
|
||
|
|
- # haven't supplied a proper program with main(), but that does not
|
||
|
|
- # matter.
|
||
|
|
- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
|
||
|
|
-
|
||
|
|
- c_compiler = shutil.which('gcc')
|
||
|
|
- if not c_compiler:
|
||
|
|
- c_compiler = shutil.which('cc')
|
||
|
|
- if not c_compiler:
|
||
|
|
- # No C compiler available, give up
|
||
|
|
- return None
|
||
|
|
-
|
||
|
|
- temp = tempfile.NamedTemporaryFile()
|
||
|
|
- try:
|
||
|
|
- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
|
||
|
|
-
|
||
|
|
- env = dict(os.environ)
|
||
|
|
- env['LC_ALL'] = 'C'
|
||
|
|
- env['LANG'] = 'C'
|
||
|
|
- try:
|
||
|
|
- proc = subprocess.Popen(args,
|
||
|
|
- stdout=subprocess.PIPE,
|
||
|
|
- stderr=subprocess.STDOUT,
|
||
|
|
- env=env)
|
||
|
|
- except OSError: # E.g. bad executable
|
||
|
|
- return None
|
||
|
|
- with proc:
|
||
|
|
- trace = proc.stdout.read()
|
||
|
|
- finally:
|
||
|
|
- try:
|
||
|
|
- temp.close()
|
||
|
|
- except FileNotFoundError:
|
||
|
|
- # Raised if the file was already removed, which is the normal
|
||
|
|
- # behaviour of GCC if linking fails
|
||
|
|
- pass
|
||
|
|
- res = re.search(expr, trace)
|
||
|
|
- if not res:
|
||
|
|
- return None
|
||
|
|
- return os.fsdecode(res.group(0))
|
||
|
|
+ return None
|
||
|
|
|
||
|
|
|
||
|
|
if sys.platform == "sunos5":
|
||
|
|
@@ -255,34 +216,7 @@ elif os.name == "posix":
|
||
|
|
else:
|
||
|
|
|
||
|
|
def _findSoname_ldconfig(name):
|
||
|
|
- import struct
|
||
|
|
- if struct.calcsize('l') == 4:
|
||
|
|
- machine = os.uname().machine + '-32'
|
||
|
|
- else:
|
||
|
|
- machine = os.uname().machine + '-64'
|
||
|
|
- mach_map = {
|
||
|
|
- 'x86_64-64': 'libc6,x86-64',
|
||
|
|
- 'ppc64-64': 'libc6,64bit',
|
||
|
|
- 'sparc64-64': 'libc6,64bit',
|
||
|
|
- 's390x-64': 'libc6,64bit',
|
||
|
|
- 'ia64-64': 'libc6,IA-64',
|
||
|
|
- }
|
||
|
|
- abi_type = mach_map.get(machine, 'libc6')
|
||
|
|
-
|
||
|
|
- # XXX assuming GLIBC's ldconfig (with option -p)
|
||
|
|
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
|
||
|
|
- regex = os.fsencode(regex % (re.escape(name), abi_type))
|
||
|
|
- try:
|
||
|
|
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
|
||
|
|
- stdin=subprocess.DEVNULL,
|
||
|
|
- stderr=subprocess.DEVNULL,
|
||
|
|
- stdout=subprocess.PIPE,
|
||
|
|
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
|
||
|
|
- res = re.search(regex, p.stdout.read())
|
||
|
|
- if res:
|
||
|
|
- return os.fsdecode(res.group(1))
|
||
|
|
- except OSError:
|
||
|
|
- pass
|
||
|
|
+ return None
|
||
|
|
|
||
|
|
def _findLib_ld(name):
|
||
|
|
# See issue #9998 for why this is needed
|
||
|
|
--
|
||
|
|
2.15.0
|
||
|
|
|