openssl: improve compatibility with older versions

xmake-io · Dec 31, 2024 · c86fa6e · c86fa6e
1 parent d6a3f76
commit c86fa6e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/packages/o/openssl/configure/patch.lua b/packages/o/openssl/configure/patch.lua
@@ -158,16 +158,9 @@ function _replace_NUL_with_null()
 end
 
 function main(package)
-    try {
-        function()
-            _remove_unused_pod_usage()
-            _replace_NUL_with_null()
-            _fix_overlong_make_recipe()
-        end,
-        catch {
-            function (errors)
-                cprint("${color.error}" .. errors .. "${clear}\n")
-            end
-        }
-    }
+    _remove_unused_pod_usage()
+    if not package:gitref() and package:version():ge("1.1.1") then
+        _replace_NUL_with_null()
+        _fix_overlong_make_recipe()
+    end
 end
diff --git a/packages/o/openssl/xmake.lua b/packages/o/openssl/xmake.lua
@@ -81,7 +81,10 @@ package("openssl")
     on_install("windows", function (package)
         import("package.tools.jom", {try = true})
         import("package.tools.nmake")
-        local configs = {"Configure", "no-tests"}
+        local configs = {"Configure"}
+        if not package:gitref() and package:version():ge("1.1.1") then
+            table.insert(configs, "no-tests")
+        end
         local target
         if package:is_arch("x86", "i386") then
             target = "VC-WIN32"
@@ -96,14 +99,14 @@ package("openssl")
         table.insert(configs, package:config("shared") and "shared" or "no-shared")
         table.insert(configs, "--prefix=" .. package:installdir())
         table.insert(configs, "--openssldir=" .. package:installdir())
-        if jom then
+        if jom and (not package:gitref() and package:version():ge("1.1.1")) then
             table.insert(configs, "no-makedepend")
             table.insert(configs, "/FS")
         end
         import("configure.patch")(package)
         os.vrunv("perl", configs)
 
-        if jom then
+        if jom and (not package:gitref() and package:version():ge("1.1.1")) then
             jom.build(package)
             jom.make(package, {"install_sw"})
         else
@@ -114,7 +117,7 @@ package("openssl")
 
     on_install("linux", "macosx", "bsd", "cross", "android", "iphoneos", "mingw", function (package)
         -- https://wiki.openssl.org/index.php/Compilation_and_Installation#PREFIX_and_OPENSSLDIR
-        local configs = {"no-tests"}
+        local configs = (not package:gitref() and package:version():ge("1.1.1")) and {"no-tests"} or {}
         if package:is_cross() or package:is_plat("mingw") then
             local target_plat, target_arch
             if package:is_plat("macosx") then