]> granicus.if.org Git - python/commitdiff
fix find_library on Solaris (closes #5289)
authorBenjamin Peterson <benjamin@python.org>
Mon, 4 Feb 2013 00:25:11 +0000 (19:25 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 4 Feb 2013 00:25:11 +0000 (19:25 -0500)
Lib/ctypes/util.py
Misc/ACKS
Misc/NEWS

index 5555b2e41febe32f60c3095195563c088c77ee5c..151560427272a2496e7d88dbefe4988c09cc61ac 100644 (file)
@@ -166,6 +166,35 @@ elif os.name == "posix":
             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):
index 17faa8ffb2274e09f0f1c35752669dfcfcb49e50..2828a8b131ddf6bd0028e65d866ca92347e75285 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1250,6 +1250,7 @@ Richard Walker
 Larry Wall
 Kevin Walzer
 Rodrigo Steinmuller Wanderley
+Ke Wang
 Greg Ward
 Zachary Ware
 Barry Warsaw
index 6f8084e0a1cbf039b1311816d77e1603a3289fec..97e391e6ad14c2cbc3f68ff7375a51b003bf2a78 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -163,6 +163,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).