[tbb] Change hwloc into a default feature (microsoft#33586)

keynmol · Sep 8, 2023 · db95d1c · db95d1c
1 parent 7b5ca09
commit db95d1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tbb",
   "version": "2021.10.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",
@@ -17,9 +17,15 @@
       "host": true
     }
   ],
+  "default-features": [
+    {
+      "name": "hwloc",
+      "platform": "!static & !osx"
+    }
+  ],
   "features": {
     "hwloc": {
-      "description": "Builds TBB with TBBBind support for Hibrid CPUs or NUMA architectures.",
+      "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.",
       "supports": "!static & !osx",
       "dependencies": [
         "hwloc"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8070,7 +8070,7 @@
     },
     "tbb": {
       "baseline": "2021.10.0",
-      "port-version": 1
+      "port-version": 2
     },
     "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": "376c59cda9f516006ce87b0f5da05be5a67fed7d",
+      "version": "2021.10.0",
+      "port-version": 2
+    },
     {
       "git-tree": "e8bd03cdf65a8793c09146f67f942afa941c68a0",
       "version": "2021.10.0",