Merge branch 'improve-wheel-build' of github.com:xmlsec/python-xmlsec into improve-wheel-build

Author: mxamin

build_support/lib_xmlsec_dependency_builder.py

@@ -1,13 +1,13 @@
 import multiprocessing
 import os
-from pathlib import Path
 import platform
 import subprocess
 import sys
 import tarfile
 import zipfile
 from dataclasses import dataclass
 from distutils.errors import DistutilsError
+from pathlib import Path
 from urllib.parse import urljoin
 from urllib.request import urlcleanup
 
@@ -361,40 +361,41 @@ def _build_libxslt(self, env, prefix_arg, host_arg):
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}'], cwd=str(libxslt_dir), env=env)
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install'], cwd=str(libxslt_dir), env=env)
 
+
 def _build_xmlsec1(self, env, prefix_arg, host_arg):
-        self.info('Building xmlsec1')
-        xmlsec1_dir = next(self.build_libs_dir.glob('xmlsec1-*'))
-        subprocess.check_call(
-            [
-                './configure',
-                prefix_arg,
-                '--disable-shared',
-                '--disable-gost',
-                '--enable-md5',
-                '--enable-ripemd160',
-                '--disable-crypto-dl',
-                '--enable-static=yes',
-                '--enable-shared=no',
-                '--enable-static-linking=yes',
-                '--with-default-crypto=openssl',
-                f'--with-openssl={self.prefix_dir}',
-                f'--with-libxml={self.prefix_dir}',
-                f'--with-libxslt={self.prefix_dir}',
-                *host_arg,
-            ],
-            cwd=str(xmlsec1_dir),
-            env=env,
-        )
-        include_flags = [
-            f'-I{self.prefix_dir / "include"}',
-            f'-I{self.prefix_dir / "include" / "libxml"}',
-        ]
-        subprocess.check_call(
-            ['make', f'-j{multiprocessing.cpu_count() + 1}', *include_flags],
-            cwd=str(xmlsec1_dir),
-            env=env,
-        )
-        subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install'], cwd=str(xmlsec1_dir), env=env)
+    self.info('Building xmlsec1')
+    xmlsec1_dir = next(self.build_libs_dir.glob('xmlsec1-*'))
+    subprocess.check_call(
+        [
+            './configure',
+            prefix_arg,
+            '--disable-shared',
+            '--disable-gost',
+            '--enable-md5',
+            '--enable-ripemd160',
+            '--disable-crypto-dl',
+            '--enable-static=yes',
+            '--enable-shared=no',
+            '--enable-static-linking=yes',
+            '--with-default-crypto=openssl',
+            f'--with-openssl={self.prefix_dir}',
+            f'--with-libxml={self.prefix_dir}',
+            f'--with-libxslt={self.prefix_dir}',
+            *host_arg,
+        ],
+        cwd=str(xmlsec1_dir),
+        env=env,
+    )
+    include_flags = [
+        f'-I{self.prefix_dir / "include"}',
+        f'-I{self.prefix_dir / "include" / "libxml"}',
+    ]
+    subprocess.check_call(
+        ['make', f'-j{multiprocessing.cpu_count() + 1}', *include_flags],
+        cwd=str(xmlsec1_dir),
+        env=env,
+    )
+    subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install'], cwd=str(xmlsec1_dir), env=env)
 
 
 __all__ = ('CrossCompileInfo', 'LibXmlsecDependencyBuilder')