openssl: fix for macos ARM64 (#3062)

* openssl: fix for macos ARM64

packages/o/openssl/xmake.lua

@@ -1,7 +1,7 @@
 package("openssl")
-
     set_homepage("https://www.openssl.org/")
     set_description("A robust, commercial-grade, and full-featured toolkit for TLS and SSL.")
+    set_license("Apache-2.0")
 
     add_urls("https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_$(version).zip", {version = function (version)
         return version:gsub("^(%d+)%.(%d+)%.(%d+)-?(%a*)$", "%1_%2_%3%4")
@@ -100,57 +100,50 @@ package("openssl")
         import("package.tools.make").make(package, {"install_sw"})
     end)
 
-    on_install("linux", "macosx", "bsd", function (package)
+    on_install("linux", "macosx", "bsd", "cross", "android", function (package)
         -- https://wiki.openssl.org/index.php/Compilation_and_Installation#PREFIX_and_OPENSSLDIR
-        local buildenvs = import("package.tools.autoconf").buildenvs(package)
-        local configs = {"--openssldir=" .. package:installdir(),
-                         "--prefix=" .. package:installdir()}
+        local configs = {}
+        if package:is_cross() then
+            local target_plat, target_arch
+            if package:is_plat("macosx") then
+                target_plat = "darwin64"
+                target_arch = package:is_arch("arm64") and "arm64-cc" or "x86_64-cc"
+            else
+                target_plat = "linux"
+                if package:is_arch("x86_64") then
+                    target_arch = "x86_64"
+                elseif package:is_arch("i386", "x86") then
+                    target_arch = "x86"
+                elseif package:is_arch("arm64", "arm64-v8a") then
+                    target_arch = "aarch64"
+                elseif package:is_arch("arm.*") then
+                    target_arch = "armv4"
+                elseif package:is_arch(".*64") then
+                    target_arch = "generic64"
+                else
+                    target_arch = "generic32"
+                end
+            end
+            table.insert(configs, target_plat .. "-" .. target_arch)
+            if package:is_plat("cross", "android") then
+                table.insert(configs, "-DOPENSSL_NO_HEARTBEATS")
+                table.insert(configs, "no-threads")
+            end
+        end
+        table.insert(configs, "--openssldir=" .. package:installdir())
+        table.insert(configs, "--prefix=" .. package:installdir())
         table.insert(configs, package:config("shared") and "shared" or "no-shared")
         if package:debug() then
             table.insert(configs, "--debug")
         end
-        os.vrunv("./config", configs, {envs = buildenvs})
+        local buildenvs = import("package.tools.autoconf").buildenvs(package)
+        os.vrunv(package:is_cross() and "./Configure" or "./config", configs, {envs = buildenvs})
         import("package.tools.make").build(package)
         import("package.tools.make").make(package, {"install_sw"})
         if package:config("shared") then
             os.tryrm(path.join(package:installdir("lib"), "*.a"))
         end
     end)
-
-    on_install("cross", "android", function (package)
-
-        local target_arch = "generic32"
-        if package:is_arch("x86_64") then
-            target_arch = "x86_64"
-        elseif package:is_arch("i386", "x86") then
-            target_arch = "x86"
-        elseif package:is_arch("arm64", "arm64-v8a") then
-            target_arch = "aarch64"
-        elseif package:is_arch("arm.*") then
-            target_arch = "armv4"
-        elseif package:is_arch(".*64") then
-            target_arch = "generic64"
-        end
-
-        local target_plat = "linux"
-        if package:is_plat("macosx") then
-            target_plat = "darwin64"
-            target_arch = "x86_64-cc"
-        end
-
-        local target = target_plat .. "-" .. target_arch
-        local configs = {target,
-                         "-DOPENSSL_NO_HEARTBEATS",
-                         "no-shared",
-                         "no-threads",
-                         "--openssldir=" .. package:installdir(),
-                         "--prefix=" .. package:installdir()}
-        local buildenvs = import("package.tools.autoconf").buildenvs(package)
-        os.vrunv("./Configure", configs, {envs = buildenvs})
-        import("package.tools.make").build(package)
-        import("package.tools.make").make(package, {"install_sw"})
-    end)
-
     on_test(function (package)
         assert(package:has_cfuncs("SSL_new", {includes = "openssl/ssl.h"}))
     end)