update uchardet, llhttp, expat and cpu-features (#1794)

* update uchardet

* update llhttp

* update expat

* fix uchardet

* update cpu-features

* fix cpu-features
pull/1796/head
Hoildkv 2 years ago committed by GitHub
parent 3bf97073e3
commit 55f86008e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      packages/c/cpu-features/xmake.lua
  2. 2
      packages/e/expat/xmake.lua
  3. 1
      packages/l/llhttp/xmake.lua
  4. 7
      packages/u/uchardet/xmake.lua

@ -7,10 +7,13 @@ package("cpu-features")
add_urls("https://github.com/google/cpu_features/archive/$(version).tar.gz", add_urls("https://github.com/google/cpu_features/archive/$(version).tar.gz",
"https://github.com/google/cpu_features.git") "https://github.com/google/cpu_features.git")
add_versions("v0.6.0", "95a1cf6f24948031df114798a97eea2a71143bd38a4d07d9a758dda3924c1932") add_versions("v0.6.0", "95a1cf6f24948031df114798a97eea2a71143bd38a4d07d9a758dda3924c1932")
add_versions("v0.7.0", "df80d9439abf741c7d2fdcdfd2d26528b136e6c52976be8bd0cd5e45a27262c0")
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
add_deps("cmake") add_deps("cmake")
on_install("windows", "linux", "macosx", "android", function (package) on_install("windows|x64", "windows|x86", "linux", "macosx", "android", function (package)
local configs = {"-DBUILD_TESTING=OFF"} local configs = {"-DBUILD_TESTING=OFF"}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
if package:is_plat("linux") then if package:is_plat("linux") then
@ -21,7 +24,7 @@ package("cpu-features")
end) end)
on_test(function (package) on_test(function (package)
if package:is_plat(os.host()) then if not package:is_cross() then
os.vrun("list_cpu_features") os.vrun("list_cpu_features")
end end
assert(package:has_ctypes("CacheLevelInfo", {includes = "cpu_features/cpu_features_cache_info.h"})) assert(package:has_ctypes("CacheLevelInfo", {includes = "cpu_features/cpu_features_cache_info.h"}))

@ -5,6 +5,7 @@ package("expat")
set_license("MIT") set_license("MIT")
set_urls("https://github.com/libexpat/libexpat/releases/download/R_$(version).tar.bz2", {version = function (version) return version:gsub("%.", "_") .. "/expat-" .. version end}) set_urls("https://github.com/libexpat/libexpat/releases/download/R_$(version).tar.bz2", {version = function (version) return version:gsub("%.", "_") .. "/expat-" .. version end})
add_versions("2.5.0", "6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67")
add_versions("2.4.8", "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16") add_versions("2.4.8", "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16")
add_versions("2.4.7", "e149bdd8b90254c62b3d195da53a09bd531a4d63a963b0d8a5268d48dd2f6a65") add_versions("2.4.7", "e149bdd8b90254c62b3d195da53a09bd531a4d63a963b0d8a5268d48dd2f6a65")
add_versions("2.4.5", "fbb430f964c7a2db2626452b6769e6a8d5d23593a453ccbc21701b74deabedff") add_versions("2.4.5", "fbb430f964c7a2db2626452b6769e6a8d5d23593a453ccbc21701b74deabedff")
@ -14,7 +15,6 @@ package("expat")
add_versions("2.2.6", "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2") add_versions("2.2.6", "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2")
add_deps("cmake") add_deps("cmake")
on_load("windows", function (package) on_load("windows", function (package)
if not package:config("shared") then if not package:config("shared") then
package:add("defines", "XML_STATIC") package:add("defines", "XML_STATIC")

@ -6,6 +6,7 @@ package("llhttp")
add_urls("https://github.com/nodejs/llhttp/archive/release/$(version).tar.gz") add_urls("https://github.com/nodejs/llhttp/archive/release/$(version).tar.gz")
add_versions("v3.0.0", "02931556e69f8d075edb5896127099e70a093c104a994a57b4d72c85b48d25b0") add_versions("v3.0.0", "02931556e69f8d075edb5896127099e70a093c104a994a57b4d72c85b48d25b0")
add_versions("v8.1.0", "9da0d23453e8e242cf3b2bc5d6fb70b1517b8a70520065fcbad6be787e86638e")
on_install(function (package) on_install(function (package)
io.writefile("xmake.lua", [[ io.writefile("xmake.lua", [[

@ -1,9 +1,12 @@
package("uchardet") package("uchardet")
set_homepage("https://www.freedesktop.org/wiki/Software/uchardet/") set_homepage("https://www.freedesktop.org/wiki/Software/uchardet/")
set_description("uchardet is an encoding detector library, which takes a sequence of bytes in an unknown character encoding without any additional information, and attempts to determine the encoding of the text. ") set_description("uchardet is an encoding detector library, which takes a sequence of bytes in an unknown character encoding without any additional information, and attempts to determine the encoding of the text. ")
add_urls("https://www.freedesktop.org/software/uchardet/releases/uchardet-$(version).tar.xz") set_license("MPL-1.1")
add_urls("https://www.freedesktop.org/software/uchardet/releases/uchardet-$(version).tar.xz")
add_versions("0.0.7", "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1") add_versions("0.0.7", "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1")
add_versions("0.0.8", "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0")
on_load(function (package) on_load(function (package)
package:addenv("PATH", "bin") package:addenv("PATH", "bin")
@ -41,7 +44,7 @@ package("uchardet")
end) end)
on_test(function (package) on_test(function (package)
if package:is_plat(os.host()) then if not package:is_cross() then
os.vrun("uchardet -v") os.vrun("uchardet -v")
end end
assert(package:has_cfuncs("uchardet_get_charset", {includes = "uchardet.h"})) assert(package:has_cfuncs("uchardet_get_charset", {includes = "uchardet.h"}))

Loading…
Cancel
Save