fix find_library on Solaris (closes #5289)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 5555b2e..1515604 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -166,6 +166,35 @@
res.sort(key=_num_version)
return res[-1]
+ elif sys.platform == "sunos5":
+
+ def _findLib_crle(name, is64):
+ if not os.path.exists('/usr/bin/crle'):
+ return None
+
+ if is64:
+ cmd = 'env LC_ALL=C /usr/bin/crle -64 2>/dev/null'
+ else:
+ cmd = 'env LC_ALL=C /usr/bin/crle 2>/dev/null'
+
+ for line in os.popen(cmd).readlines():
+ line = line.strip()
+ if line.startswith('Default Library Path (ELF):'):
+ paths = line.split()[4]
+
+ if not paths:
+ return None
+
+ for dir in paths.split(":"):
+ libfile = os.path.join(dir, "lib%s.so" % name)
+ if os.path.exists(libfile):
+ return libfile
+
+ return None
+
+ def find_library(name, is64 = False):
+ return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
+
else:
def _findSoname_ldconfig(name):
diff --git a/Misc/ACKS b/Misc/ACKS
index 17faa8f..2828a8b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1250,6 +1250,7 @@
Larry Wall
Kevin Walzer
Rodrigo Steinmuller Wanderley
+Ke Wang
Greg Ward
Zachary Ware
Barry Warsaw
diff --git a/Misc/NEWS b/Misc/NEWS
index 6f8084e..97e391e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,8 @@
Library
-------
+- Issue #5289: Fix ctypes.util.find_library on Solaris.
+
- Issue #17106: Fix a segmentation fault in io.TextIOWrapper when an underlying
stream or a decoder produces data of an unexpected type (i.e. when
io.TextIOWrapper initialized with text stream or use bytes-to-bytes codec).