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.

Sign up for GitHub

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

Update tbb 2021.12.0 #4121

Merged
merged 15 commits into from
May 24, 2024
Merged

Update tbb 2021.12.0 #4121

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
df3bcfb
Update tbb 2021.12.0
Altina-oz May 23, 2024
ecec2bc
Update xmake.lua
Altina-oz May 24, 2024
f7a6046
fix
Altina-oz May 24, 2024
b12aeff
typo
Altina-oz May 24, 2024
2da88a0
test add undefied version only
Altina-oz May 24, 2024
94d600c
typo2
Altina-oz May 24, 2024
4459795
test
Altina-oz May 24, 2024
e09ad81
Update xmake.lua
Altina-oz May 24, 2024
c56f634
Test ndk log pattern
Altina-oz May 24, 2024
43c0574
Update xmake.lua
Altina-oz May 24, 2024
2037e2f
Update xmake.lua
Altina-oz May 24, 2024
37a52a5
typo
Altina-oz May 24, 2024
0b6b7e3
ndk r26* workaround Test
Altina-oz May 24, 2024
b8f4970
re-test due to configure pagefile failure
Altina-oz May 24, 2024
ab84a6d
Update xmake.lua
star-hengxing May 24, 2024
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
17 changes: 15 additions & 2 deletions packages/t/tbb/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package("tbb")
add_versions("2021.7.0", "2cae2a80cda7d45dc7c072e4295c675fff5ad8316691f26f40539f7e7e54c0cc")
add_versions("2021.10.0", "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b")
add_versions("2021.11.0", "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363")
add_versions("2021.12.0", "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f")
else
add_urls("https://github.com/oneapi-src/oneTBB/archive/v$(version).tar.gz")
add_versions("2020.3", "ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3")
Expand All @@ -29,7 +30,8 @@ package("tbb")
add_versions("2021.7.0", "2cae2a80cda7d45dc7c072e4295c675fff5ad8316691f26f40539f7e7e54c0cc")
add_versions("2021.10.0", "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b")
add_versions("2021.11.0", "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363")

add_versions("2021.12.0", "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f")

add_patches("2021.2.0", path.join(os.scriptdir(), "patches", "2021.2.0", "gcc11.patch"), "181511cf4878460cb48ac0531d3ce8d1c57626d698e9001a0951c728fab176fb")
add_patches("2021.5.0", path.join(os.scriptdir(), "patches", "2021.5.0", "i386.patch"), "1a1c11724839cf98b1b8f4d415c0283ec7719c330b11503c578739eb02889ec0")

Expand Down Expand Up @@ -64,7 +66,18 @@ package("tbb")
io.replace("cmake/compilers/GNU.cmake", "-Wl,-z,relro,-z,now,-z,noexecstack", "", {plain = true})
table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=" .. (package:is_arch("x86_64") and "AMD64" or "i686"))
end
import("package.tools.cmake").install(package, configs)

local exflags
if package:is_plat("android") then
import("core.tool.toolchain")

local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()})
local ndkver = ndk:config("ndkver")
if ndkver == 26 then
exflags = {"-Wl,--undefined-version"}
end
end
import("package.tools.cmake").install(package, configs, {shflags = exflags, ldflags = exflags})
if package:is_plat("mingw") then
local ext = package:config("shared") and ".dll.a" or ".a"
local libfiles = os.files(path.join(package:installdir("lib"), "libtbb*" .. ext))
Expand Down
Loading