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

[tbb] Fix build for non-English systems #43291

Merged
merged 1 commit into from
Jan 16, 2025
Merged

[tbb] Fix build for non-English systems #43291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ports/tbb/fix-lang.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
index cf6d8bdb..458ea339 100644
--- a/cmake/compilers/GNU.cmake
+++ b/cmake/compilers/GNU.cmake
@@ -48,7 +48,7 @@ endif()
# information is written to either stdout or stderr. To not make any
# assumptions, both are captured.
execute_process(
- COMMAND ${CMAKE_COMMAND} -E env "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null
+ COMMAND ${CMAKE_COMMAND} -E env "LC_ALL=C" "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null
OUTPUT_VARIABLE ASSEMBLER_VERSION_LINE_OUT
ERROR_VARIABLE ASSEMBLER_VERSION_LINE_ERR
OUTPUT_STRIP_TRAILING_WHITESPACE
2 changes: 2 additions & 0 deletions ports/tbb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3
HEAD_REF master
PATCHES
fix-lang.patch # https://github.com/uxlfoundation/oneTBB/pull/1606
)

vcpkg_check_features(
Expand Down
1 change: 1 addition & 0 deletions ports/tbb/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tbb",
"version": "2022.0.0",
"port-version": 1,
"description": "Intel's Threading Building Blocks.",
"homepage": "https://github.com/oneapi-src/oneTBB",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8858,7 +8858,7 @@
},
"tbb": {
"baseline": "2022.0.0",
"port-version": 0
"port-version": 1
},
"tcb-span": {
"baseline": "2022-06-15",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tbb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e8eb4f6f5f53c1b56598b26a951b8d49cf349d0d",
"version": "2022.0.0",
"port-version": 1
},
{
"git-tree": "1190d84d0e84ec7100662a4c35cd6a27ce532864",
"version": "2022.0.0",
Expand Down