Merge tag 'v0.22.10'

release v0.22.10

python/build/libs.py

@@ -388,14 +388,14 @@ ffmpeg = FfmpegProject(
 )
 
 openssl = OpenSSLProject(
-    'https://www.openssl.org/source/openssl-3.0.0-alpha16.tar.gz',
-    '08ce8244b59d75f40f91170dfcb012bf25309cdcb1fef9502e39d694f883d1d1',
+    'https://www.openssl.org/source/openssl-3.0.0-beta2.tar.gz',
+    'e76ab22879201b12f014393ee4becec7f264d8f6955b1036839128002868df71',
     'include/openssl/ossl_typ.h',
 )
 
 curl = AutotoolsProject(
-    'https://curl.se/download/curl-7.76.1.tar.xz',
-    '64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145',
+    'https://curl.se/download/curl-7.78.0.tar.xz',
+    'be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5',
     'lib/libcurl.a',
     [
         '--disable-shared', '--enable-static',

python/build/openssl.py

@@ -17,6 +17,12 @@ class OpenSSLProject(MakeProject):
             'build_libs',
         ]
 
+    def get_make_install_args(self, toolchain):
+        # OpenSSL's Makefile runs "ranlib" during installation
+        return MakeProject.get_make_install_args(self, toolchain) + [
+            'RANLIB=' + toolchain.ranlib,
+        ]
+
     def build(self, toolchain):
         src = self.unpack(toolchain, out_of_tree=False)
 
@@ -42,6 +48,7 @@ class OpenSSLProject(MakeProject):
         }
 
         openssl_arch = openssl_archs[toolchain.arch]
+        cross_compile_prefix = toolchain.toolchain_arch + '-'
 
         subprocess.check_call(['./Configure',
                                'no-shared',
@@ -50,6 +57,7 @@ class OpenSSLProject(MakeProject):
                                'no-tests',
                                'no-asm', # "asm" causes build failures on Windows
                                openssl_arch,
+                               '--cross-compile-prefix=' + cross_compile_prefix,
                                '--prefix=' + toolchain.install_prefix],
                               cwd=src, env=toolchain.env)
         MakeProject.build(self, toolchain, src)

python/build/project.py

@@ -20,7 +20,7 @@ class Project:
             self.base = base
 
         if name is None or version is None:
-            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*(?:-alpha\d+)?)(\+.*)?$', self.base)
+            m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*(?:-(?:alpha|beta)\d+)?)$', self.base)
             if name is None: name = m.group(1)
             if version is None: version = m.group(2)