components/python/python34/patches/21-default-lib-path.patch
author John Beck <John.Beck@Oracle.COM>
Tue, 22 Dec 2015 07:57:25 -0800
changeset 5229 b7b91ddbbdce
parent 3671 91f76aae1155
permissions -rw-r--r--
22456127 Upgrade Python 3.4 line to 3.4.4

This patch was developed in-house.  It has been submitted upstream:
http://bugs.python.org/issue23287

--- Python-3.4.2/Lib/ctypes/util.py.~1~	2014-10-08 01:18:12.000000000 -0700
+++ Python-3.4.2/Lib/ctypes/util.py	2015-01-20 15:51:09.024341756 -0800
@@ -169,23 +169,11 @@
 
     elif sys.platform == "sunos5":
 
-        def _findLib_crle(name, is64):
-            if not os.path.exists('/usr/bin/crle'):
-                return None
-
+        def _findLib_path(name, is64):
             if is64:
-                cmd = 'env LC_ALL=C /usr/bin/crle -64 2>/dev/null'
+                paths = "/lib/64:/usr/lib/64"
             else:
-                cmd = 'env LC_ALL=C /usr/bin/crle 2>/dev/null'
-
-            with contextlib.closing(os.popen(cmd)) as f:
-                for line in f.readlines():
-                    line = line.strip()
-                    if line.startswith('Default Library Path (ELF):'):
-                        paths = line.split()[4]
-
-            if not paths:
-                return None
+                paths = "/lib:/usr/lib"
 
             for dir in paths.split(":"):
                 libfile = os.path.join(dir, "lib%s.so" % name)
@@ -195,7 +183,7 @@
             return None
 
         def find_library(name, is64 = False):
-            return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
+            return _get_soname(_findLib_path(name, is64) or _findLib_gcc(name))
 
     else: