From 777bd1c80d6ed0c71bb63785b7a2b1c432cdc241 Mon Sep 17 00:00:00 2001 From: Tab Nahida Date: Sun, 2 Mar 2025 16:24:44 +0800 Subject: [PATCH 1/2] Update xmake.lua --- packages/i/ispc/xmake.lua | 50 ++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/packages/i/ispc/xmake.lua b/packages/i/ispc/xmake.lua index 6a9ae3e8b..cac60aaa1 100644 --- a/packages/i/ispc/xmake.lua +++ b/packages/i/ispc/xmake.lua @@ -1,46 +1,58 @@ package("ispc") - set_kind("toolchain") set_homepage("https://ispc.github.io/") set_description("Intel® Implicit SPMD Program Compiler") set_license("BSD-3-Clause") - add_configs("oneapi", {description = "Use the OneAPI version on Linux", default = false, type = "boolean"}) + -- add_configs("oneapi", {description = "Use the OneAPI version on Linux", default = false, type = "boolean"}) if is_host("windows") then - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-windows.zip") + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-windows.zip", + "https://github.com/ispc/ispc.git") add_versions("1.17.0", "e9a7cc98f69357482985bcbf69fa006632cee7b3606069b4d5e16dc62092d660") add_versions("1.25.3", "3a97e325f236c34a68013bf56fcb4e23c811b404207a60c010dc38fa24e60c55") + add_versions("1.26.0", "cffe9904d32260994fa264f8fca60eac7be9f8995c122bacf456a1c66ac72987") elseif is_host("macosx") then if is_arch("x86_64") then - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.x86_64.tar.gz") + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.x86_64.tar.gz", + "https://github.com/ispc/ispc.git") add_versions("1.25.3", "6f35c5aec01a607c98d5661ef0f9e4d13665011247b17dfbc2f6a326120cb2aa") + add_versions("1.26.0", "6c171c7aa85f5237a8c72091754a76c8b9d95119ec4c8cfe444c7c9a264eec5f") elseif is_arch("arm64") then - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.arm64.tar.gz") - add_versions("1.25.3", "a2bc150402bb9523261063d45a0f0deae50900c62238ae031cf9b9530393a4ac") + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.arm64.tar.gz", + "https://github.com/ispc/ispc.git") + add_versions("1.25.3", "a2bc150402bb9523261063d45f0f0deae50900c62238ae031cf9b9530393a4ac") + add_versions("1.26.0", "02f29de79643875fa4ba42eb46fc27bf6f36d931c8f11d6e9ae18a013388ab5d") else - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.universal.tar.gz") + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.universal.tar.gz", + "https://github.com/ispc/ispc.git") add_versions("1.25.3", "c6a83d1d0c37698f3bba7fd1a44835af0236248efdaf2b4a32b768e9cbd04163") + add_versions("1.26.0", "fbe99daaade7baac941dd593aa0e442b8f2ed453b21a3d54bd8c9dbe46bc693") end elseif is_host("linux") then - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux.tar.gz") - add_versions("1.17.0", "6acc5df75efdce437f79b1b6489be8567c6d009e19dcc4851b9b37012afce1f7") - add_versions("1.25.3", "4a89260cc1d216881735db4e60be72ca4630b8453f352b159867e215c85e1dbd") - if is_arch("aarch64") then - add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux.aarch64.tar.gz") + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux.aarch64.tar.gz", + "https://github.com/ispc/ispc.git") add_versions("1.25.3", "990c509244f32189c7b6e4ea49793706a62445e727b41f10b0883d98fc66f696") + add_versions("1.26.0", "c24347e95f504d44f17395b5e6df591c14c40762ad59e4fa130b9a56f2c85da7") + else + add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux.tar.gz", + "https://github.com/ispc/ispc.git") + add_versions("1.17.0", "6acc5df75efdce437f79b1b6489be8567c6d009e19dcc4851b9b37012afce1f7") + add_versions("1.25.3", "4a89260cc1d216881735db4e60be72ca4630b8453f352b159867e215c85e1dbd") + add_versions("1.26.0", "a50e1d504a6e9bd719188ee57257d76475c8abee957ff9160307756c2a1bbe17") end - - on_load(function (package) - if package:config("oneapi") then - package:add("urls", "https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux-oneapi.tar.gz") - package:add("versions", "1.25.3", "526fe36638e675b9e1bb0618ac30f5286339e7a7e7f5a8441cd7607177292804") - end - end) + -- on_load(function (package) + -- if package:config("oneapi") then + -- package:add("urls", "https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-linux-oneapi.tar.gz") + -- package:add("versions", "1.25.3", "526fe36638e675b9e1bb0618ac30f5286339e7a7e7f5a8441cd7607177292804") + -- else + -- end + -- end) end on_install("@windows", "@macosx", "@linux", function (package) + -- os.run("python scripts/quick-start-build.py") Fail to build from source. Need more os.cp("*", package:installdir()) end) From ce067929a36d8bfed15321bbcbc5985d714f6cf1 Mon Sep 17 00:00:00 2001 From: Tab Nahida Date: Sun, 2 Mar 2025 16:37:02 +0800 Subject: [PATCH 2/2] Update xmake.lua --- packages/i/ispc/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/i/ispc/xmake.lua b/packages/i/ispc/xmake.lua index cac60aaa1..bfbf33249 100644 --- a/packages/i/ispc/xmake.lua +++ b/packages/i/ispc/xmake.lua @@ -21,7 +21,7 @@ package("ispc") elseif is_arch("arm64") then add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.arm64.tar.gz", "https://github.com/ispc/ispc.git") - add_versions("1.25.3", "a2bc150402bb9523261063d45f0f0deae50900c62238ae031cf9b9530393a4ac") + add_versions("1.25.3", "a2bc150402bb9523261063d45a0f0deae50900c62238ae031cf9b9530393a4ac") add_versions("1.26.0", "02f29de79643875fa4ba42eb46fc27bf6f36d931c8f11d6e9ae18a013388ab5d") else add_urls("https://github.com/ispc/ispc/releases/download/v$(version)/ispc-v$(version)-macOS.universal.tar.gz",