From a08daeb2d4a23ed250b0f8fd9b4818aeab63e268 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 18 Sep 2024 22:53:09 +0800 Subject: [PATCH 1/2] flux: add v0.4.0 version --- packages/f/flux/xmake.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/f/flux/xmake.lua b/packages/f/flux/xmake.lua index 5b5cf192b61..e408e9fdcad 100644 --- a/packages/f/flux/xmake.lua +++ b/packages/f/flux/xmake.lua @@ -4,11 +4,17 @@ package("flux") set_description("A C++20 library for sequence-orientated programming") set_license("BSL-1.0") - add_urls("https://github.com/tcbrindle/flux.git") - add_versions("2023.08.17", "8434e8e0fd131cebc3aed0d845530335bf7fb5e1") + add_urls("https://github.com/tcbrindle/flux/archive/refs/tags/$(version).tar.gz", + "https://github.com/tcbrindle/flux.git") + + add_versions("v0.4.0", "95e7d9d71c9ee9e89bb24b46ccba77ddfb0a1580630c2faab0b415dacc7c8d56") + + add_deps("cmake") on_install(function (package) - os.cp("include", package:installdir()) + local configs = {"-DFLUX_BUILD_EXAMPLES=OFF", "-DFLUX_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + import("package.tools.cmake").install(package, configs) end) on_test(function (package) From e760b59eca0a8b9d71025618777acdcffca82ca0 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 18 Sep 2024 23:56:44 +0800 Subject: [PATCH 2/2] add check --- packages/f/flux/xmake.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/f/flux/xmake.lua b/packages/f/flux/xmake.lua index e408e9fdcad..e66b60bc8f8 100644 --- a/packages/f/flux/xmake.lua +++ b/packages/f/flux/xmake.lua @@ -11,6 +11,25 @@ package("flux") add_deps("cmake") + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk") + local ndkver = ndk:config("ndkver") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndkver and tonumber(ndkver) > 22, "package(flux) require ndk version > 22") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(flux) require ndk api >= 24") + end) + + on_check("windows", function (package) + local vs_toolset = package:toolchain("msvc"):config("vs_toolset") + if vs_toolset then + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + assert(minor and minor >= 30, "package(flux) require vs_toolset >= 14.3") + end + end) + end + on_install(function (package) local configs = {"-DFLUX_BUILD_EXAMPLES=OFF", "-DFLUX_BUILD_TESTS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))