crossenv - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

crossenv.egg-info/PKG-INFO

 Metadata-Version: 1.2
 Name: crossenv
-Version: 1.1.1
+Version: 1.1.2
 Summary: A cross-compiling tool for Python extension modules
@@ -5,0 +5,0 @@ Home-page: https://github.com/benfogle/crossenv

crossenv/__init__.py

@@ -22,3 +22,3 @@ import venv
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
@@ -320,2 +320,3 @@ logger = logging.getLogger(__name__)
         self.host_version = self.host_sysconfigdata.build_time_vars['VERSION']
+        self.host_gnu_type = self.host_sysconfigdata.build_time_vars['HOST_GNU_TYPE']
 
@@ -326,7 +327,5 @@ # Ask the makefile a few questions too
 
-        # Default: not actually cross compiling
-        self.host_platform = sysconfig.get_platform() 
+        self.host_platform = None
         with open(self.host_makefile, 'r') as fp:
             lines = list(fp.readlines())
-
         for line in lines:
@@ -340,2 +339,14 @@ line = line.strip()
 
+        if self.host_platform is None:
+            # It was probably natively compiled, but not necessarily for this
+            # architecture. Guess from HOST_GNU_TYPE.
+            host = self.host_gnu_type.split('-')
+            if len(host) == 4: # i.e., aarch64-unknown-linux-gnu
+                self.host_platform = '-'.join([host[2], host[0]])
+            elif len(host) == 3: # i.e., aarch64-linux-gnu, unlikely.
+                self.host_platform = '-'.join([host[1], host[0]])
+            else:
+                logger.warning("Cannot determine platform. Using build.")
+                self.host_platform = sysconfig.get_platform()
+
         self.macosx_deployment_target = ''
@@ -466,13 +477,11 @@ for line in lines:
             self.host_sysname = sys.platform
-            self.host_machine = platform.machine()
-        elif len(host_info) == 1:
+        elif len(host_info) >= 1:
             self.host_sysname = host_info[0]
-            self.host_machine = platform.machine()
-        elif host_info[-1] == "powerpc64le":
+
+        if len(host_info) > 1 and host_info[-1] == "powerpc64le":
+            # Test that this is still a special case when we can.
             # On uname.machine=ppc64le, _PYTHON_HOST_PLATFORM is linux-powerpc64le
-            self.host_sysname = host_info[0]
             self.host_machine = "ppc64le"
         else:
-            self.host_sysname = host_info[0]
-            self.host_machine = host_info[-1]
+            self.host_machine = self.host_gnu_type.split('-')[0]
 
@@ -795,2 +804,9 @@ self.host_release = ''
 
+        # Handle the case where host-python was natively compiled on another
+        # architecture. This is only needed because someone (me) thought it was
+        # a good idea to compare BUILD_GNU_TYPE to HOST_GNU_TYPE to detect
+        # cross compiling.
+        build_time_vars['BUILD_GNU_TYPE'] = \
+                sysconfig.get_config_var('BUILD_GNU_TYPE')
+
         # Overrides from --config_var options
@@ -797,0 +813,0 @@ for key, value in self.host_config_vars.items():

PKG-INFO

 Metadata-Version: 1.2
 Name: crossenv
-Version: 1.1.1
+Version: 1.1.2
 Summary: A cross-compiling tool for Python extension modules
@@ -5,0 +5,0 @@ Home-page: https://github.com/benfogle/crossenv

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

97243

0.97%

Lines of code

1060

1.34%