components/python/python34/patches/06-solaris-64-bit.patch
branchs11-update
changeset 3783 9edbfb2ff34a
parent 3782 689605272627
child 2168 416ecfb814c9
equal deleted inserted replaced
3782:689605272627 3783:9edbfb2ff34a
   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.1/Lib/importlib/_bootstrap.py.~1~	2014-05-18 22:19:38.000000000 -0700
   127 --- 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-06 08:37:18.145242823 -0700
   128 +++ Python-3.4.1/Lib/importlib/_bootstrap.py	2014-08-27 08:46:00.145242823 -0700
   129 @@ -2046,6 +2046,15 @@
   129 @@ -2046,6 +2046,15 @@
   130                  is_namespace = _path_isdir(base_path)
   130                  is_namespace = _path_isdir(base_path)
   131          # Check for a file w/ a proper suffix exists.
   131          # Check for a file w/ a proper suffix exists.
   132          for suffix, loader_class in self._loaders:
   132          for suffix, loader_class in self._loaders:
   133 +            message = 'checking {!r}: {!r}'.format(self.path, suffix)
   133 +            message = 'checking {!r}: {!r}'.format(self.path, suffix)
   134 +            _verbose_message(message, verbosity=2)
   134 +            _verbose_message(message, verbosity=2)
   135 +            # If in 64-bit mode, append /64 to the path.
   135 +            # If in 64-bit mode, append /64 to the path for .so files.
   136 +            if suffix == '.so' and sys.maxsize != 2 ** 31 - 1:
   136 +            if suffix.endswith('.so') and sys.maxsize != 2 ** 31 - 1:
   137 +                full_path = _path_join(self.path, '64', tail_module + suffix)
   137 +                full_path = _path_join(self.path, '64', tail_module + suffix)
   138 +                _verbose_message('trying {}'.format(full_path), verbosity=2)
   138 +                _verbose_message('trying {}'.format(full_path), verbosity=2)
   139 +                if _path_isfile(full_path):
   139 +                if _path_isfile(full_path):
   140 +                    self.path += '/64'
   140 +                    self.path += '/64'
   141 +                    return self._get_spec(loader_class, fullname, full_path, None, target)
   141 +                    return self._get_spec(loader_class, fullname, full_path, None, target)