libgit2: improve deps (#5418)

* libgit2: improve deps

* disable libssh

* patch android c90 -> c99

* add check

* remove htpps limit

* improve https backend

* fix mbedtls

* improve iphoneos

* fix iphoneos

* llhttp: fix export symbol
autoupdate-croaring-v4.2.1
star9029 2 months ago committed by GitHub
parent a71eedca32
commit 8fbf38d4ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 152
      packages/l/libgit2/xmake.lua
  2. 8
      packages/l/llhttp/xmake.lua

@ -1,53 +1,153 @@
package("libgit2") package("libgit2")
set_homepage("https://libgit2.org/") set_homepage("https://libgit2.org/")
set_description("A cross-platform, linkable library implementation of Git that you can use in your application.") set_description("A cross-platform, linkable library implementation of Git that you can use in your application.")
set_license("GPL-2.0-only") set_license("GPL-2.0-only")
set_urls("https://github.com/libgit2/libgit2/archive/refs/tags/$(version).tar.gz", set_urls("https://github.com/libgit2/libgit2/archive/refs/tags/$(version).tar.gz",
"https://github.com/libgit2/libgit2.git") "https://github.com/libgit2/libgit2.git")
add_versions("v1.8.1", "8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e") add_versions("v1.8.1", "8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e")
add_versions("v1.8.0", "9e1d6a880d59026b675456fbb1593c724c68d73c34c0d214d6eb848e9bbd8ae4") add_versions("v1.8.0", "9e1d6a880d59026b675456fbb1593c724c68d73c34c0d214d6eb848e9bbd8ae4")
add_versions("v1.7.1", "17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327") add_versions("v1.7.1", "17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327")
add_versions("v1.3.0", "192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e") add_versions("v1.3.0", "192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e")
add_deps("cmake") add_configs("ssh", {description = "Enable SSH support", default = false, type = "boolean"})
if is_plat("macosx", "iphoneos") then add_configs("tools", {description = "Build tools", default = false, type = "boolean"})
add_configs("https", {description = "Select crypto backend.", default = (is_plat("windows", "mingw") and "winhttp" or "openssl"), type = "string", values = {"winhttp", "openssl", "mbedtls"}})
if is_plat("linux", "bsd") then
add_syslinks("pthread", "dl")
elseif is_plat("windows", "mingw") then
add_syslinks("ole32", "rpcrt4", "winhttp", "ws2_32", "user32", "crypt32", "advapi32")
elseif is_plat("macosx", "iphoneos") then
add_frameworks("CoreFoundation", "Security") add_frameworks("CoreFoundation", "Security")
add_syslinks("iconv", "z") add_syslinks("iconv", "z")
else
add_deps("openssl", "zlib")
end end
if is_plat("linux") then
add_deps("pcre") add_deps("cmake")
add_syslinks("pthread", "dl") if is_subhost("windows") then
elseif is_plat("windows") then add_deps("pkgconf")
add_syslinks("ole32", "rpcrt4", "winhttp", "ws2_32", "user32", "crypt32", "advapi32")
end end
on_install("macosx", "linux", "windows|x64", "windows|x86", "iphoneos", function (package) add_deps("pcre2", "llhttp")
local configs = {"-DBUILD_TESTS=OFF", if not is_plat("macosx", "iphoneos") then
"-DBUILD_CLAR=OFF", add_deps("zlib")
"-DBUILD_EXAMPLES=OFF", end
"-DBUILD_FUZZERS=OFF",
"-DBUILD_CLI=OFF", if on_check then
"-DUSE_SSH=OFF"} on_check("windows", function (package)
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) -- undefined symbol __except_handler4_common(msvcrt)
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_arch("x86") and package:has_runtime("MD", "MDd") and package:config("shared") then
if package:is_plat("android", "iphoneos") then raise("package(libgit2) unsupported x86 & MD & shared")
table.insert(configs, "-DUSE_HTTPS=OFF") end
elseif package:is_plat("windows") then end)
if package:config("vs_runtime"):startswith("MT") then
table.insert(configs, "-DSTATIC_CRT=ON") on_check("android", function (package)
if package:is_arch("armeabi-v7a") then
local ndk = package:toolchain("ndk")
local ndkver = ndk:config("ndkver")
assert(ndkver and tonumber(ndkver) > 22, "package(libgit2) deps(pcre2) require ndk version > 22")
end
end)
end
on_load(function (package)
local https = package:config("https")
if package:is_plat("iphoneos") and https == "openssl" then
-- TODO: openssl support iphoneos
return
end
if https ~= "winhttp" then
package:add("deps", https)
end
if package:config("ssh") then
local backend
if https == "winhttp" then
backend = "wincng"
else else
table.insert(configs, "-DSTATIC_CRT=OFF") backend = https
end
package:add("deps", "libssh2", {configs = {backend = backend}})
end
end)
on_install("!wasm", function (package)
if package:is_plat("android") then
for _, file in ipairs(os.files("src/**.txt")) do
if path.basename(file) == "CMakeLists" then
io.replace(file, "C_STANDARD 90", "C_STANDARD 99", {plain = true})
end
end end
elseif package:is_plat("windows") then
-- MDd == _MT + _DLL + _DEBUG
io.replace("cmake/DefaultCFlags.cmake", "/D_DEBUG", "", {plain = true})
-- Use CMAKE_MSVC_RUNTIME_LIBRARY
io.replace("cmake/DefaultCFlags.cmake", "/MT", "", {plain = true})
io.replace("cmake/DefaultCFlags.cmake", "/MTd", "", {plain = true})
io.replace("cmake/DefaultCFlags.cmake", "/MD", "", {plain = true})
io.replace("cmake/DefaultCFlags.cmake", "/MDd", "", {plain = true})
io.replace("CMakeLists.txt", "/GL", "", {plain = true}) io.replace("CMakeLists.txt", "/GL", "", {plain = true})
if package:version():eq("1.7.1") then if package:version():eq("1.7.1") then
io.replace("cmake/DefaultCFlags.cmake", "/GL", "", {plain = true}) io.replace("cmake/DefaultCFlags.cmake", "/GL", "", {plain = true})
end end
end end
import("package.tools.cmake").install(package, configs)
local https = package:config("https")
if https ~= "winhttp" then
if package:is_plat("windows", "mingw", "msys") then
-- Need to pass `-DUSE_HTTPS=xxxssl`, but let cmake auto-detect is convenient
io.replace("cmake/SelectHTTPSBackend.cmake", "elseif(WIN32)", "elseif(0)", {plain = true})
end
if https == "mbedtls" then
local links = {"${MBEDTLS_LIBRARY}", "${MBEDX509_LIBRARY}", "${MBEDCRYPTO_LIBRARY}"}
if package:is_plat("windows", "mingw", "msys") then
table.join2(links, {"ws2_32", "advapi32", "bcrypt"})
end
io.replace("cmake/FindmbedTLS.cmake",
[["-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}"]],
table.concat(links, " "), {plain = true})
end
end
local configs = {
"-DBUILD_TESTS=OFF",
"-DBUILD_CLAR=OFF",
"-DBUILD_EXAMPLES=OFF",
"-DBUILD_FUZZERS=OFF",
"-DREGEX_BACKEND=pcre2",
"-DUSE_HTTP_PARSER=llhttp",
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DUSE_SSH=" .. (package:config("ssh") and "ON" or "OFF"))
table.insert(configs, "-DBUILD_CLI=" .. (package:config("tools") and "ON" or "OFF"))
if package:is_plat("windows") then
table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''")
elseif package:is_plat("iphoneos") and https == "openssl" then
table.insert(configs, "-DUSE_HTTPS=OFF")
elseif package:is_plat("mingw") then
local mingw = import("detect.sdks.find_mingw")()
local dlltool = assert(os.files(path.join(mingw.bindir, "*dlltool*"))[1], "dlltool not found!")
table.insert(configs, "-DDLLTOOL=" .. dlltool)
end
local opt = {}
local pcre2 = package:dep("pcre2")
if not pcre2:config("shared") then
opt.cxflags = "-DPCRE2_STATIC"
end
import("package.tools.cmake").install(package, configs, opt)
if package:is_plat("windows") and package:is_debug() then
local dir = package:installdir(package:config("shared") and "bin" or "lib")
os.vcp(path.join(package:buildir(), "*.pdb"), dir)
end
end) end)
on_test(function (package) on_test(function (package)

@ -16,6 +16,12 @@ package("llhttp")
end) end)
on_install(function (package) on_install(function (package)
io.replace("include/llhttp.h", "__wasm__", "__GNUC__", {plain = true})
io.replace("include/llhttp.h", "_WIN32", "_MSC_VER", {plain = true})
if not package:config("shared") then
io.replace("include/llhttp.h", "__declspec(dllexport)", "", {plain = true})
end
local xmake_configs = {} local xmake_configs = {}
if package:version():ge("9.2.1") then if package:version():ge("9.2.1") then
-- Get cmake config file -- Get cmake config file
@ -32,8 +38,6 @@ package("llhttp")
if package:config("shared") then if package:config("shared") then
io.replace(package:installdir("include/llhttp.h"), "__declspec(dllexport)", "__declspec(dllimport)", {plain = true}) io.replace(package:installdir("include/llhttp.h"), "__declspec(dllexport)", "__declspec(dllimport)", {plain = true})
else
io.replace(package:installdir("include/llhttp.h"), "__declspec(dllexport)", "", {plain = true})
end end
end) end)

Loading…
Cancel
Save