Skip to content

Commit 4d4b282

Browse files
authored
Merge pull request #43 from xqyjlj/update-toolchains-dev
✨ feat: update toolchains
2 parents 8df3f42 + 3ac7f76 commit 4d4b282

17 files changed

Lines changed: 20 additions & 731 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ build/
22
.xmake/
33
rootfs/
44
.vscode/
5-
private/
5+
/private
6+
/prebuilt

repo/packages/a/aarch64-smart-musleabi/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do
3636
if (version and sha256) then
3737
add_versions(version, sha256)
3838
else
39-
add_versions("188177", "01dae6cea76959e7a2684630ca1c295e71ca65a288b4787a6595e93d45edba1e")
39+
add_versions("203958-15706d647d", "49571ae1228a50b1836e5580448e5fe597af6a3346bd6d7b3d21459c29f4c0b8")
4040
end
4141
elseif is_host("linux") then
4242
add_urls(
@@ -45,7 +45,7 @@ do
4545
if (version and sha256) then
4646
add_versions(version, sha256)
4747
else
48-
add_versions("188177", "e4e2720c0269eb0b00231f865abe2340f1e994490dfbc3d8617eee48098dbc1d")
48+
add_versions("203958-15706d647d", "f76ea0fabe245b20585f3bf86003a76183a2cad6d07c939877f211439c94dc9f")
4949
end
5050
end
5151

repo/packages/a/arm-smart-musleabi/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do
3636
if (version and sha256) then
3737
add_versions(version, sha256)
3838
else
39-
add_versions("174629", "c059a516917a5703456c8414eecb29f1456560ff60707c8a5b352f5ef58bdb72")
39+
add_versions("203958-15706d647d", "79b0e2afef8475b689ba7477d25fb67eda123d4aa135aa2d50dbac4744bc1d05")
4040
end
4141
elseif is_host("linux") then
4242
add_urls(
@@ -45,7 +45,7 @@ do
4545
if (version and sha256) then
4646
add_versions(version, sha256)
4747
else
48-
add_versions("174629", "b187482fa807fbfd822eb79ee5a8c0e4e576ad3de4aa088d73b12e21c8de174a")
48+
add_versions("203958-15706d647d", "69d0b888297ac8236c59d90c3affcd71f831f8dc9ac058dcdfb024006f955ce3")
4949
end
5050
end
5151

repo/packages/p/pcre/xmake.lua

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ do
6666
table.insert(configs, "-DPCRE_BUILD_PCRE" .. bitwidth .. "=ON")
6767
end
6868

69-
local instance = package:toolchain(info.toolchains)
70-
local ld = instance:get("toolset")["ld"]
71-
local cxx = instance:get("toolset")["cxx"]
72-
instance:set("toolset", "ld", cxx)
7369
import("package.tools.cmake").install(package, configs, {buildir = "build", ldflags = ldflags})
74-
instance:set("toolset", "ld", ld)
7570
end)
7671

7772
on_test(function(package)
73+
local bitwidth = package:config("bitwidth") or "8"
74+
local testfunc = string.format("pcre%s_compile", bitwidth ~= "8" and bitwidth or "")
75+
assert(package:has_cfuncs(testfunc, {includes = "pcre.h"}))
7876
end)
7977
end

repo/packages/r/riscv64gc-unknown-smart-musl/xmake.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ do
3131

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

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

4545
if (version and sha256) then
4646
add_versions(version, sha256)
4747
else
48-
add_versions("180881", "21ad2cbd9b4e73e61efd8211b88c3989acaa033a374ac2f26b4e15a7ec7370b6")
48+
add_versions("203957-8a397096c1", "19d9a73b1dff1d941953fcb673443259d89362c2e56d1d260af0cc503d9e9f5b")
4949
end
5050
end
5151

tools/ldscripts/aarch64/link.lds

Lines changed: 0 additions & 134 deletions
This file was deleted.

tools/ldscripts/aarch64/link.so.lds

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)