components/python/python34/patches/06-solaris-64-bit.patch
changeset 4209 107a604ac200
parent 2183 5d00686e81da
child 4776 b00579b61ffc
equal deleted inserted replaced
4206:a24a2855075c 4209:107a604ac200
   122 +            self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),
   122 +            self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),
   123 +                             sysconfig.get_config_var('LDSHARED'))
   123 +                             sysconfig.get_config_var('LDSHARED'))
   124          self.assertEqual(global_sysconfig.get_config_var('CC'),
   124          self.assertEqual(global_sysconfig.get_config_var('CC'),
   125                           sysconfig.get_config_var('CC'))
   125                           sysconfig.get_config_var('CC'))
   126  
   126  
       
   127 --- Python-3.4.3/Lib/imp.py.~1~	2015-02-25 03:27:44.000000000 -0800
       
   128 +++ Python-3.4.3/Lib/imp.py	2015-04-27 11:24:24.814046529 -0700
       
   129 @@ -287,7 +287,13 @@
       
   130                  return None, package_directory, ('', '', PKG_DIRECTORY)
       
   131          for suffix, mode, type_ in get_suffixes():
       
   132              file_name = name + suffix
       
   133 -            file_path = os.path.join(entry, file_name)
       
   134 +            # If in 64-bit mode, append /64 to the path for .so files
       
   135 +            # (if not already there).
       
   136 +            if type_ == C_EXTENSION and sys.maxsize != 2**31 - 1 and \
       
   137 +               entry[-3:] != '/64':
       
   138 +                file_path = os.path.join(entry, "64", file_name)
       
   139 +            else:
       
   140 +                file_path = os.path.join(entry, file_name)
       
   141              if os.path.isfile(file_path):
       
   142                  break
       
   143          else:
   127 --- Python-3.4.1/Lib/importlib/_bootstrap.py.~1~	2014-05-18 22:19:38.000000000 -0700
   144 --- Python-3.4.1/Lib/importlib/_bootstrap.py.~1~	2014-05-18 22:19:38.000000000 -0700
   128 +++ Python-3.4.1/Lib/importlib/_bootstrap.py	2014-08-27 08:46:00.145242823 -0700
   145 +++ Python-3.4.1/Lib/importlib/_bootstrap.py	2014-08-27 08:46:00.145242823 -0700
   129 @@ -2046,6 +2046,14 @@
   146 @@ -2046,6 +2046,14 @@
   130                  is_namespace = _path_isdir(base_path)
   147                  is_namespace = _path_isdir(base_path)
   131          # Check for a file w/ a proper suffix exists.
   148          # Check for a file w/ a proper suffix exists.