[tbb] explicitly disable hwloc feature for UWP (#34648)

* tbb: disable hwloc feature for UWP * updated version database
microsoft · Oct 23, 2023 · 0d8e0f2 · 0d8e0f2
1 parent 2d0bfe5
commit 0d8e0f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json
@@ -2,11 +2,11 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tbb",
   "version": "2021.10.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",
-  "supports": "(windows & !uwp) | linux | osx | ios | android",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -20,13 +20,13 @@
   "default-features": [
     {
       "name": "hwloc",
-      "platform": "!static & !osx"
+      "platform": "!static & !osx & !uwp"
     }
   ],
   "features": {
     "hwloc": {
       "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.",
-      "supports": "!static & !osx",
+      "supports": "!static & !osx & !uwp",
       "dependencies": [
         "hwloc"
       ]

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8182,7 +8182,7 @@
     },
     "tbb": {
       "baseline": "2021.10.0",
-      "port-version": 2
+      "port-version": 3
     },
     "tcb-span": {
       "baseline": "2022-06-15",

diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4cde1e2a3654b8540b76ac295675a37bdbca311",
+      "version": "2021.10.0",
+      "port-version": 3
+    },
     {
       "git-tree": "376c59cda9f516006ce87b0f5da05be5a67fed7d",
       "version": "2021.10.0",