From f727c31133822b3e39f851fcca9d3239f389c054 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 3 Feb 2013 19:25:11 -0500 Subject: [PATCH] fix find_library on Solaris (closes #5289) --- Lib/ctypes/util.py | 29 +++++++++++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 2 ++ 3 files changed, 32 insertions(+) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 7aee0eff99..fe2b520532 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -180,6 +180,35 @@ elif os.name == "posix": res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y))) 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 e811705e1e..15bf415d32 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1044,6 +1044,7 @@ Charles Waldman Richard Walker Larry Wall Kevin Walzer +Ke Wang Greg Ward Zachary Ware Barry Warsaw diff --git a/Misc/NEWS b/Misc/NEWS index 1a91e8fca7..dacfc8bd1d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -199,6 +199,8 @@ Core and Builtins 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). -- 2.40.0