enable openssl for python

packages/m/meson/xmake.lua

@@ -10,7 +10,7 @@ package("meson")
 
     add_deps("ninja", "python 3.x")
   
-    on_install("macosx", "linux", "windows", function (package)
+    on_install("macosx", "linux", function (package)
         import("core.base.semver")
         local version = semver.new(package:dep("python"):version_str())
         local envs = {PYTHONPATH = package:installdir("lib", "python" .. version:major() .. "." .. version:minor(), "site-packages")}

packages/p/python/xmake.lua

@@ -34,6 +34,10 @@ package("python")
         add_versions("2.7.15", "18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db")
         add_versions("3.7.0", "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d")
     end
+
+    if is_host("macosx", "linux") then
+        add_deps("openssl")
+    end
  
     on_load(function (package)
         if is_host("windows") then
@@ -54,7 +58,31 @@ package("python")
     end)
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        -- unset these so that installing pip and setuptools puts them where we want
+        -- and not into some other Python the user has installed.
+        local PYTHONHOME = os.getenv("PYTHONHOME")
+        local PYTHONPATH = os.getenv("PYTHONPATH")
+        os.setenv("PYTHONHOME", "")
+        os.setenv("PYTHONPATH", "")
+
+        -- init configs
+        local configs = {"--enable-ipv6", "--without-ensurepip"}
+        table.insert(configs, "--datadir=" .. package:installdir("share"))
+        table.insert(configs, "--datarootdir=" .. package:installdir("share"))
+
+        -- add openssl libs path for detecting
+        local openssl_dir = package:dep("openssl"):installdir()
+        if package:version_str():startswith("3") then
+            table.insert(configs, "--with-openssl=" .. openssl_dir)
+        else
+            io.gsub("setup.py", "/usr/local/ssl", openssl_dir)
+        end
+
+        -- do install
+        import("package.tools.autoconf").install(package, configs)
+
+        os.setenv("PYTHONHOME", PYTHONHOME)
+        os.setenv("PYTHONPATH", PYTHONPATH)
     end)
 
     on_test(function (package)

packages/p/python2/xmake.lua

@@ -16,6 +16,10 @@ package("python2")
         set_urls("https://www.python.org/ftp/python/$(version)/Python-$(version).tgz")
         add_versions("2.7.15", "18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db")
     end
+
+    if is_host("macosx", "linux") then
+        add_deps("openssl")
+    end
  
     on_load(function (package)
         if is_host("windows") then
@@ -32,7 +36,25 @@ package("python2")
     end)
 
     on_install("macosx", "linux", function (package)
-        import("package.tools.autoconf").install(package)
+        -- unset these so that installing pip and setuptools puts them where we want
+        -- and not into some other Python the user has installed.
+        local PYTHONHOME = os.getenv("PYTHONHOME")
+        local PYTHONPATH = os.getenv("PYTHONPATH")
+        os.setenv("PYTHONHOME", "")
+        os.setenv("PYTHONPATH", "")
+
+        -- init configs
+        local configs = {"--enable-ipv6", "--without-ensurepip"}
+        table.insert(configs, "--datadir=" .. package:installdir("share"))
+        table.insert(configs, "--datarootdir=" .. package:installdir("share"))
+
+        -- add openssl libs path for detecting
+        io.gsub("setup.py", "/usr/local/ssl", package:dep("openssl"):installdir())
+
+        -- do install
+        import("package.tools.autoconf").install(package, configs)
+        os.setenv("PYTHONHOME", PYTHONHOME)
+        os.setenv("PYTHONPATH", PYTHONPATH)
     end)
 
     on_test(function (package)

packages/s/skia/xmake.lua

@@ -3,17 +3,22 @@ package("skia")
     set_homepage("https://skia.org/")
     set_description("A complete 2D graphic library for drawing Text, Geometries, and Images.")
 
-    set_urls("hhttps://skia.googlesource.com/skia.git",
+    set_urls("https://skia.googlesource.com/skia.git",
              "https://github.com/google/skia.git")
 
-    add_versions("2f3637", "2f3637bf2ed44ef75966786ab4c2974d17c9f649")
+    add_versions("68046c", "68046cd7be837bd31bc8f0e821a2f82a02dda9cf")
 
-    add_deps("python", "ninja")
+    add_deps("python2", "ninja")
 
     on_install("macosx", "linux", "windows", function (package)
-        os.vrun("python tools/git-sync-deps")
+        os.vrun("git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git")
+        local pathes = os.getenv("PATH")
+        os.addenv("PATH", path.join(os.curdir(), "depot_tools"))
+        os.addenv("PATH", path.join(os.curdir(), "bin"))
+        os.vrun("python2 tools/git-sync-deps")
         os.vrun("bin/gn gen build --args='is_official_build=true is_debug=false'")
         os.vrun("ninja -C build")
+        os.setenv("PATH", pathes)
     end)
 
     on_test(function (package)