From 00522055eec20fafa2c1c291d081f8dcd5881f74 Mon Sep 17 00:00:00 2001 From: Amrit Bhogal Date: Sun, 30 Jun 2024 13:23:49 -0700 Subject: [PATCH 1/5] Updated objfw --- packages/o/objfw/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 1e1ce34de97..8348c103a55 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -19,6 +19,8 @@ package("objfw") add_versions("1.1.0", "79f6a6fdc90ad6474206c8f649d66415b09a3f07b9c6ddbaf64129291fd12d94") add_versions("1.1.1", "0492a08f964180b7453c05bd9f0080e70b61171a9b5194a6d1b891370c24cfc0") add_versions("1.1.2", "5d9f9a70d583298e780ae11fc75a7ae2beeef904b301e1bc4f4ffa8d7ee31d9f") + add_versions("1.1.3", "e66ff27ac93c5747019aaa5c8a72b2e4508938e59b3ce08909e54e566ebb2e41") + add_versions("1.1.4", "f6bfdbab22008aae3e4b48d77ced1a04c5153961c6f7e5492891f90ae5131a78") if is_host("linux", "macosx") then From 6c93ec2d3aa0a1e9dedb5653cf90e42b42e04b5a Mon Sep 17 00:00:00 2001 From: Amrit Bhogal Date: Mon, 12 Aug 2024 20:33:56 -0700 Subject: [PATCH 2/5] update objfw --- packages/o/objfw/xmake.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 8348c103a55..a43306b29cb 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -21,6 +21,8 @@ package("objfw") add_versions("1.1.2", "5d9f9a70d583298e780ae11fc75a7ae2beeef904b301e1bc4f4ffa8d7ee31d9f") add_versions("1.1.3", "e66ff27ac93c5747019aaa5c8a72b2e4508938e59b3ce08909e54e566ebb2e41") add_versions("1.1.4", "f6bfdbab22008aae3e4b48d77ced1a04c5153961c6f7e5492891f90ae5131a78") + add_versions("1.1.5", "9d45d2009a0bb9b1a0918918e454b47b8161670df8016b5f3a85eccea91d8988") + add_versions("1.1.6", "c19a97a011e14780fb32cfbdbbd6a699a955b57124e4e079768cb8aad4430e1d") if is_host("linux", "macosx") then @@ -32,7 +34,7 @@ package("objfw") add_frameworks("CoreFoundation") end - add_configs("tls", { description = "Enable TLS support.", default = (is_plat("macosx") and "securetransport" or "openssl"), values = { true, false, "openssl", "gnutls", "securetransport" } }) + add_configs("tls", { description = "Enable TLS support.", default = (is_plat("macosx") and "securetransport" or "openssl"), values = { true, false, "openssl", "gnutls", "securetransport", "mbedtls" } }) add_configs("rpath", { description = "Enable rpath.", default = true, type = "boolean" }) add_configs("runtime", { description = "Use the included runtime, not recommended for macOS!", default = not is_plat("macosx"), type = "boolean" }) add_configs("seluid24", { description = "Use 24 bit instead of 16 bit for selector UIDs.", default = false, type = "boolean" }) @@ -61,7 +63,11 @@ package("objfw") local tls = package:config("tls") if type(tls) == "boolean" then if tls then - package:add("deps", "openssl") + if is_plat("macosx") then + package:add("frameworks", "Security") + else + package:add("deps", "openssl") + end end elseif tls then if tls == "openssl" then @@ -70,6 +76,10 @@ package("objfw") package:add("frameworks", "Security") elseif tls == "gnutls" then package:add("deps", "gnutls") + elseif tls == "mbedtls" then + package:add("deps", "mbedtls") + else + raise("Unknown TLS library: %s", tls) end end end) @@ -94,7 +104,8 @@ package("objfw") end end - -- SecureTransport must be handled by system so we don't worry about providing CFLAGS and LDFLAGS + -- SecureTransport must be handled by system so we don't worry about providing CFLAGS and LDFLAGS, + -- but for OpenSSL and GnuTLS we need to provide the paths local ssl = package:dep("openssl") or package:dep("gnutls") local is_gnu = ssl and ssl:name() == "gnutls" if ssl then From 98b6233dbf159ffa27ecf306b28896ebc2153e0a Mon Sep 17 00:00:00 2001 From: Amrit Bhogal Date: Thu, 15 Aug 2024 08:44:01 -0700 Subject: [PATCH 3/5] use package:is_plat --- packages/o/objfw/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index a43306b29cb..07e62dc026a 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -63,7 +63,7 @@ package("objfw") local tls = package:config("tls") if type(tls) == "boolean" then if tls then - if is_plat("macosx") then + if package:is_plat("macosx") then package:add("frameworks", "Security") else package:add("deps", "openssl") From ddac77a70ac5358e21db259ab9459faca0d2359d Mon Sep 17 00:00:00 2001 From: Amrit Bhogal Date: Sun, 25 Aug 2024 14:55:23 -0700 Subject: [PATCH 4/5] Updated objfw --- packages/o/objfw/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 07e62dc026a..04e6698705e 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -23,7 +23,7 @@ package("objfw") add_versions("1.1.4", "f6bfdbab22008aae3e4b48d77ced1a04c5153961c6f7e5492891f90ae5131a78") add_versions("1.1.5", "9d45d2009a0bb9b1a0918918e454b47b8161670df8016b5f3a85eccea91d8988") add_versions("1.1.6", "c19a97a011e14780fb32cfbdbbd6a699a955b57124e4e079768cb8aad4430e1d") - + add_versions("1.1.7", "5107d8a0627e2270d211abf1b4f6c50fd89c8d672d2179b50daa7d3b66d68a70") if is_host("linux", "macosx") then add_deps("autoconf", "automake", "libtool") From 5b6b1bf62026198cf397a989f2a6124f48e4f4af Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 26 Aug 2024 22:36:36 +0800 Subject: [PATCH 5/5] Update xmake.lua --- packages/o/objfw/xmake.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 04e6698705e..735ab199fce 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -84,6 +84,15 @@ package("objfw") end end) + on_check(function (package) + assert(package:check_msnippets({test = [[ + void test() { + @autoreleasepool { + } + } + ]]})) + end) + on_install("linux", "macosx", function (package) local configs = {} local tls = package:config("tls")