Chiebot-Mirror
/
xmake-repo
mirror of https://github.com/xmake-io/xmake-repo.git
8
0
Fork 1
Code Issues Projects Releases Wiki Activity

Auto-update aws-c-io to v0.14.19 (#5477)

Browse Source 
* Update aws-c-io to v0.14.19

* s2n-tls: add v1.5.5 version

* improve xmake.lua

* fix iphoneos

* fix syslinks

* s2n-tls: fix android

* aws-c-cal: disable wasm

* aws-c-cal: fix android

* aws-c-io: fix android

---------

Co-authored-by: star9029 <hengxings783@gmail.com>
pull/5482/head
ruki 1 month ago committed by GitHub
parent 9b2496211c
commit 521483210c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 61 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      packages/a/aws-c-cal/xmake.lua
  2. 5
      packages/a/aws-c-common/xmake.lua
  3. 31
      packages/a/aws-c-io/xmake.lua
  4. 9
      packages/s/s2n-tls/xmake.lua

35
packages/a/aws-c-cal/xmake.lua
Unescape View File

@ -16,26 +16,40 @@ package("aws-c-cal")
add_versions("v0.6.2", "777feb1e88b261415e1ad607f7e420a743c3b432e21a66a5aaf9249149dc6fef") add_versions("v0.6.2", "777feb1e88b261415e1ad607f7e420a743c3b432e21a66a5aaf9249149dc6fef")
add_configs("openssl", {description = "Set this if you want to use your system's OpenSSL 1.0.2/1.1.1 compatible libcrypto", default = false, type = "boolean"}) add_configs("openssl", {description = "Set this if you want to use your system's OpenSSL 1.0.2/1.1.1 compatible libcrypto", default = false, type = "boolean"})
add_configs("asan", {description = "Enable Address Sanitize.", default = false, type = "boolean"}) if is_plat("wasm") then
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
end
if is_plat("windows","mingw") then
add_syslinks("bcrypt", "ncrypt")
elseif is_plat("linux", "bsd") then
add_syslinks("pthread")
elseif is_plat("macosx", "iphoneos") then
add_frameworks("Security", "CoreFoundation")
end
add_deps("cmake", "aws-c-common") add_deps("cmake", "aws-c-common")
on_load(function (package) on_load(function (package)
if not package:is_plat("windows", "mingw", "msys", "macosx") then if package:is_plat("linux", "bsd", "cross", "android") then
package:config_set("openssl", true) package:config_set("openssl", true)
end end
if package:config("openssl") then if package:config("openssl") then
package:add("deps", "openssl") package:add("deps", "openssl")
end end
if package:is_plat("windows") and package:config("shared") then
package:add("defines", "AWS_C_RT_USE_WINDOWS_DLL_SEMANTICS", "AWS_CAL_USE_IMPORT_EXPORT")
end
end) end)
on_install("windows|x64", "windows|x86", "linux", "macosx", "bsd", "msys", "cross", function (package) on_install("!wasm and (!mingw or mingw|!i386)", function (package)
local cmakedir = package:dep("aws-c-common"):installdir("lib", "cmake") local cmakedir = path.unix(package:dep("aws-c-common"):installdir("lib", "cmake"))
if package:is_plat("windows") then
cmakedir = cmakedir:gsub("\\", "/")
end
local configs = {"-DBUILD_TESTING=OFF", "-DCMAKE_MODULE_PATH=" .. cmakedir} local configs = {
"-DBUILD_TESTING=OFF",
"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW",
"-DCMAKE_MODULE_PATH=" .. cmakedir,
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) 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, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DENABLE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF"))
@ -44,6 +58,11 @@ package("aws-c-cal")
end end
table.insert(configs, "-DUSE_OPENSSL=" .. (package:config("openssl") and "ON" or "OFF")) table.insert(configs, "-DUSE_OPENSSL=" .. (package:config("openssl") and "ON" or "OFF"))
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
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)

5
packages/a/aws-c-common/xmake.lua
Unescape View File

@ -45,6 +45,11 @@ package("aws-c-common")
table.insert(configs, "-DAWS_STATIC_MSVC_RUNTIME_LIBRARY=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) table.insert(configs, "-DAWS_STATIC_MSVC_RUNTIME_LIBRARY=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))
end end
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
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)

31
packages/a/aws-c-io/xmake.lua
Unescape View File

@ -6,6 +6,7 @@ package("aws-c-io")
add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz",
"https://github.com/awslabs/aws-c-io.git") "https://github.com/awslabs/aws-c-io.git")
add_versions("v0.14.19", "127aa30608084affbcc0b7b26982ab4d98404d1aa103b91693d0e76b564da21d")
add_versions("v0.14.18", "44e9dee181ed7d867d1cc2944f4b4669259b569fc56bdd6dd4c7c30440fc4bf8") add_versions("v0.14.18", "44e9dee181ed7d867d1cc2944f4b4669259b569fc56bdd6dd4c7c30440fc4bf8")
add_versions("v0.14.16", "bf78ab5dbeeaec2f55cb035e18c49ce8ba4e2ea7519e8b94e18ccd8851e39f4d") add_versions("v0.14.16", "bf78ab5dbeeaec2f55cb035e18c49ce8ba4e2ea7519e8b94e18ccd8851e39f4d")
add_versions("v0.14.14", "c62400e83232e6d7c04bacebf02d552f6699d90735d9b8b6ee5fae879735c458") add_versions("v0.14.14", "c62400e83232e6d7c04bacebf02d552f6699d90735d9b8b6ee5fae879735c458")
@ -17,25 +18,32 @@ package("aws-c-io")
add_versions("v0.14.5", "2700bcde062f7de1c1cbfd236b9fdfc9b24b4aa6dc0fb09bb156e16e07ebd0b6") add_versions("v0.14.5", "2700bcde062f7de1c1cbfd236b9fdfc9b24b4aa6dc0fb09bb156e16e07ebd0b6")
add_versions("v0.13.32", "2a6b18c544d014ca4f55cb96002dbbc1e52a2120541c809fa974cb0838ea72cc") add_versions("v0.13.32", "2a6b18c544d014ca4f55cb96002dbbc1e52a2120541c809fa974cb0838ea72cc")
add_configs("asan", {description = "Enable Address Sanitize.", default = false, type = "boolean"}) if is_plat("wasm") then
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
end
if is_plat("windows") then if is_plat("windows","mingw") then
add_syslinks("advapi32", "crypt32", "secur32", "ncrypt") add_syslinks("advapi32", "crypt32", "secur32", "ncrypt")
elseif is_plat("linux", "bsd", "cross") then elseif is_plat("linux", "bsd", "cross", "android") then
add_deps("s2n-tls") add_deps("s2n-tls")
elseif is_plat("macosx") then elseif is_plat("macosx", "iphoneos") then
add_frameworks("Security") add_frameworks("Security")
end end
add_deps("cmake", "aws-c-common", "aws-c-cal") add_deps("cmake", "aws-c-common", "aws-c-cal")
on_install("windows|x64", "windows|x86", "linux", "macosx", "bsd", "msys", "cross", function (package) on_install("!wasm and (!mingw or mingw|!i386)", function (package)
local cmakedir = package:dep("aws-c-common"):installdir("lib", "cmake") if package:is_plat("windows") and package:config("shared") then
if package:is_plat("windows") then package:add("defines", "USE_WINDOWS_DLL_SEMANTICS", "AWS_IO_USE_IMPORT_EXPORT")
cmakedir = cmakedir:gsub("\\", "/")
end end
local configs = {"-DBUILD_TESTING=OFF", "-DCMAKE_MODULE_PATH=" .. cmakedir} local cmakedir = path.unix(package:dep("aws-c-common"):installdir("lib", "cmake"))
local configs = {
"-DBUILD_TESTING=OFF",
"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW",
"-DCMAKE_MODULE_PATH=" .. cmakedir,
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) 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, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DENABLE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF"))
@ -43,6 +51,11 @@ package("aws-c-io")
table.insert(configs, "-DAWS_STATIC_MSVC_RUNTIME_LIBRARY=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) table.insert(configs, "-DAWS_STATIC_MSVC_RUNTIME_LIBRARY=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))
end end
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
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)

9
packages/s/s2n-tls/xmake.lua
Unescape View File

@ -6,6 +6,7 @@ package("s2n-tls")
add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz", add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz",
"https://github.com/aws/s2n-tls.git") "https://github.com/aws/s2n-tls.git")
add_versions("v1.5.5", "6316e1ad2c8ef5807519758bb159d314b9fef31d79ae27bc8f809104b978bb04")
add_versions("v1.5.1", "d79710d6ef089097a3b84fc1e5cec2f08d1ec46e93b1d400df59fcfc859e15a3") add_versions("v1.5.1", "d79710d6ef089097a3b84fc1e5cec2f08d1ec46e93b1d400df59fcfc859e15a3")
add_versions("v1.5.0", "5e86d97d8f24653ef3dff3abe6165169f0ba59cdf52b5264987125bba070174d") add_versions("v1.5.0", "5e86d97d8f24653ef3dff3abe6165169f0ba59cdf52b5264987125bba070174d")
add_versions("v1.4.18", "a55b0b87eaaffc58bd44d90c5bf7903d11be816aa144296193e7d1a6bea5910e") add_versions("v1.4.18", "a55b0b87eaaffc58bd44d90c5bf7903d11be816aa144296193e7d1a6bea5910e")
@ -28,8 +29,12 @@ package("s2n-tls")
add_deps("cmake", "openssl") add_deps("cmake", "openssl")
on_install("linux", "bsd", "cross", function (package) on_install("linux", "bsd", "cross", "android", function (package)
local configs = {"-DBUILD_TESTING=OFF", "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF"} local configs = {
"-DBUILD_TESTING=OFF",
"-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF",
"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW",
}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) 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, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
table.insert(configs, "-DS2N_LTO=" .. (package:config("lto") and "ON" or "OFF")) table.insert(configs, "-DS2N_LTO=" .. (package:config("lto") and "ON" or "OFF"))

Write Preview
Loading…
Cancel
Save