Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ feat: update toolchains #43

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ build/
.xmake/
rootfs/
.vscode/
private/
/private
/prebuilt
4 changes: 2 additions & 2 deletions repo/packages/a/aarch64-smart-musleabi/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ do
if (version and sha256) then
add_versions(version, sha256)
else
add_versions("188177", "01dae6cea76959e7a2684630ca1c295e71ca65a288b4787a6595e93d45edba1e")
add_versions("203958-15706d647d", "49571ae1228a50b1836e5580448e5fe597af6a3346bd6d7b3d21459c29f4c0b8")
end
elseif is_host("linux") then
add_urls(
Expand All @@ -45,7 +45,7 @@ do
if (version and sha256) then
add_versions(version, sha256)
else
add_versions("188177", "e4e2720c0269eb0b00231f865abe2340f1e994490dfbc3d8617eee48098dbc1d")
add_versions("203958-15706d647d", "f76ea0fabe245b20585f3bf86003a76183a2cad6d07c939877f211439c94dc9f")
end
end

Expand Down
4 changes: 2 additions & 2 deletions repo/packages/a/arm-smart-musleabi/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ do
if (version and sha256) then
add_versions(version, sha256)
else
add_versions("174629", "c059a516917a5703456c8414eecb29f1456560ff60707c8a5b352f5ef58bdb72")
add_versions("203958-15706d647d", "79b0e2afef8475b689ba7477d25fb67eda123d4aa135aa2d50dbac4744bc1d05")
end
elseif is_host("linux") then
add_urls(
Expand All @@ -45,7 +45,7 @@ do
if (version and sha256) then
add_versions(version, sha256)
else
add_versions("174629", "b187482fa807fbfd822eb79ee5a8c0e4e576ad3de4aa088d73b12e21c8de174a")
add_versions("203958-15706d647d", "69d0b888297ac8236c59d90c3affcd71f831f8dc9ac058dcdfb024006f955ce3")
end
end

Expand Down
8 changes: 3 additions & 5 deletions repo/packages/p/pcre/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,12 @@ do
table.insert(configs, "-DPCRE_BUILD_PCRE" .. bitwidth .. "=ON")
end

local instance = package:toolchain(info.toolchains)
local ld = instance:get("toolset")["ld"]
local cxx = instance:get("toolset")["cxx"]
instance:set("toolset", "ld", cxx)
import("package.tools.cmake").install(package, configs, {buildir = "build", ldflags = ldflags})
instance:set("toolset", "ld", ld)
end)

on_test(function(package)
local bitwidth = package:config("bitwidth") or "8"
local testfunc = string.format("pcre%s_compile", bitwidth ~= "8" and bitwidth or "")
assert(package:has_cfuncs(testfunc, {includes = "pcre.h"}))
end)
end
8 changes: 4 additions & 4 deletions repo/packages/r/riscv64gc-unknown-smart-musl/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ do

if is_host("windows") then
add_urls(
"https://download-redirect.rt-thread.org/download/rt-smart/toolchains/riscv64-linux-musleabi_for_i686-w64-mingw32_$(version).zip")
"https://download-redirect.rt-thread.org/download/rt-smart/toolchains/riscv64gc-linux-musleabi_for_i686-w64-mingw32_$(version).zip")

if (version and sha256) then
add_versions(version, sha256)
else
add_versions("180881", "7b385fe663559985d70936832dc0f6c017ce3bddbdbfaff673996cc3a20faf6c")
add_versions("203957-8a397096c1", "0c4a43bc40ddee60774ce384d13760d235e51fd70658c5da0503caec1dd511e4")
end
elseif is_host("linux") then
add_urls(
"https://download-redirect.rt-thread.org/download/rt-smart/toolchains/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_$(version).tar.bz2")
"https://download-redirect.rt-thread.org/download/rt-smart/toolchains/riscv64gc-linux-musleabi_for_x86_64-pc-linux-gnu_$(version).tar.bz2")

if (version and sha256) then
add_versions(version, sha256)
else
add_versions("180881", "21ad2cbd9b4e73e61efd8211b88c3989acaa033a374ac2f26b4e15a7ec7370b6")
add_versions("203957-8a397096c1", "19d9a73b1dff1d941953fcb673443259d89362c2e56d1d260af0cc503d9e9f5b")
end
end

Expand Down
134 changes: 0 additions & 134 deletions tools/ldscripts/aarch64/link.lds

This file was deleted.

89 changes: 0 additions & 89 deletions tools/ldscripts/aarch64/link.so.lds

This file was deleted.

Loading