646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
|
|
From: Greg Roodt <greg@canva.com>
|
|
Date: Wed, 9 Dec 2020 17:59:24 +1100
|
|
Subject: [PATCH] Don't use ldconfig
|
|
|
|
---
|
|
Lib/ctypes/util.py | 77 ++--------------------------------------------
|
|
1 file changed, 2 insertions(+), 75 deletions(-)
|
|
|
|
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
|
|
index 0c2510e161..7fb98af308 100644
|
|
--- a/Lib/ctypes/util.py
|
|
+++ b/Lib/ctypes/util.py
|
|
@@ -268,34 +222,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.24.3 (Apple Git-128)
|