Kaynağa Gözat

update libxml2 and python (#165)

* update libxml2 and python

* allow 32bit library integration
Hoildkv 4 yıl önce
ebeveyn
işleme
952def7f80
2 değiştirilmiş dosya ile 16 ekleme ve 6 silme
  1. 14 2
      packages/l/libxml2/xmake.lua
  2. 2 4
      packages/p/python/xmake.lua

+ 14 - 2
packages/l/libxml2/xmake.lua

@@ -2,12 +2,14 @@ package("libxml2")
 
     set_homepage("http://xmlsoft.org/")
     set_description("The XML C parser and toolkit of Gnome.")
+    set_license("MIT")
 
     set_urls("http://xmlsoft.org/sources/libxml2-$(version).tar.gz",
              "https://ftp.osuosl.org/pub/blfs/conglomeration/libxml2/libxml2-$(version).tar.gz")
     add_urls("https://gitlab.gnome.org/GNOME/libxml2.git")
 
     add_versions("2.9.9", "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871")
+    add_versions("2.9.10", "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f")
 
     add_includedirs("include/libxml2")
     if is_plat("windows") then
@@ -16,6 +18,9 @@ package("libxml2")
     else
         add_links("xml2")
     end
+    if is_plat("linux") then
+        add_syslinks("m")
+    end
 
     on_load("macosx", "linux", "iphoneos", "android", function (package)
         if package:gitref() then
@@ -31,11 +36,18 @@ package("libxml2")
 
     on_install("macosx", "linux", "iphoneos", "android", function (package)
         local configs = {"--disable-dependency-tracking",
+                         "--with-pic",
                          "--without-python",
                          "--without-lzma",
                          "--without-zlib",
-                         "--without-iconv",
-                         "--enable-shared=no"}
+                         "--without-iconv"}
+        if package:config("shared") then
+            table.insert(configs, "--enable-shared=yes")
+            table.insert(configs, "--enable-static=no")
+        else
+            table.insert(configs, "--enable-shared=no")
+            table.insert(configs, "--enable-static=yes")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

+ 2 - 4
packages/p/python/xmake.lua

@@ -35,10 +35,6 @@ package("python")
         set_kind("binary")
     end
 
-    if not is_plat(os.host()) or not is_arch(os.arch()) then
-        set_kind("binary")
-    end
-
     if is_host("macosx", "linux") then
         add_deps("openssl", {host = true})
     end
@@ -56,6 +52,7 @@ package("python")
         local PYTHONPATH = package:installdir("Lib", "site-packages")
         package:addenv("PYTHONPATH", PYTHONPATH)
         package:addenv("PATH", "bin")
+        package:addenv("PATH", "Scripts")
     end)
 
     on_load("@macosx", "@linux", function (package)
@@ -73,6 +70,7 @@ package("python")
         local PYTHONPATH = package:installdir("lib", pyver, "site-packages")
         package:addenv("PYTHONPATH", PYTHONPATH)
         package:addenv("PATH", "bin")
+        package:addenv("PATH", "Scripts")
     end)
 
     on_install("@windows", "@msys", "@cygwin", function (package)