Merge pull request #154684 from ZhongRuoyu/bump-tbb-2021.11.0

tbb 2021.11.0
Homebrew · Nov 18, 2023 · 5c5e170 · 5c5e170
2 parents 83cb79f + 7c29e75
commit 5c5e170
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 34 deletions.
diff --git a/Formula/o/opencascade.rb b/Formula/o/opencascade.rb
@@ -5,7 +5,7 @@ class Opencascade < Formula
   version "7.7.2"
   sha256 "2fb23c8d67a7b72061b4f7a6875861e17d412d524527b2a96151ead1d9cfa2c1"
   license "LGPL-2.1-only"
-  revision 1
+  revision 2
 
   # The first-party download page (https://dev.opencascade.org/release)
   # references version 7.5.0 and hasn't been updated for later maintenance
@@ -21,15 +21,13 @@ class Opencascade < Formula
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "b1c6e64d1b2960510981dfa9f0dae0bd5bf6b7d7d2468afece7d7ae74a26e084"
-    sha256 cellar: :any,                 arm64_ventura:  "58ccfbc5b3cce2e4526201ae799b57b5b56baa105eaeb7df521407a803ff58ff"
-    sha256 cellar: :any,                 arm64_monterey: "4036d7412743ad4f9fad8a260b1c9d4d178a6181a85458251c2431be25b1df4e"
-    sha256 cellar: :any,                 arm64_big_sur:  "26f8f8d7bfde327d8ce6dfcca92027d65de3cdbf58c2a6ef1c8ef0bc014499ac"
-    sha256 cellar: :any,                 sonoma:         "80ff952f97f98f4a05be4951d2eac734b992bb5892ea50a593901ee748c879e8"
-    sha256 cellar: :any,                 ventura:        "735838ed1b509a878a101690451c0348103292e2b0a89a6d721acc79c01358d1"
-    sha256 cellar: :any,                 monterey:       "4f31d63a97dc8ed4993cc94f1ce0052b0fff4e6c0b0632a592aadaca55ca741c"
-    sha256 cellar: :any,                 big_sur:        "dea2039879a80c1464ea88caedf93d5cfdc094f26b5695cf29b4c7a9985611b7"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "8121480f2fc82a5806b43323a053dc39626ef8c3612c831633d0d7885819477f"
+    sha256 cellar: :any,                 arm64_sonoma:   "ac86e06df1837313ad33bb5f1fb2c73b7d2b06c4324b08ff95063190661928d0"
+    sha256 cellar: :any,                 arm64_ventura:  "0a95f11bf578d999f71a1bf8351b07632e1af283cea89cceb42968128c9d6526"
+    sha256 cellar: :any,                 arm64_monterey: "be30e7b01c9f1e5ce839ae597c6a20e9eb9377f6a04e05544ceb5a88dbbb0205"
+    sha256 cellar: :any,                 sonoma:         "9a9bf3b8405b429272962e6666080fa1b03d99d15ffbedae83eaab4ecdb1d184"
+    sha256 cellar: :any,                 ventura:        "7eaad7875b081f3895d568ec64a16b5f7989a601cd4e9dca51e5123a8c99838f"
+    sha256 cellar: :any,                 monterey:       "4de3495e2cfd924df9358fc92e19fd9c5cf4e3ffd13245cd22daad96b074047b"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "0d8edac229f1a0029c99754aa2fc8da51c6f16eefce04570622d50ba8e69a263"
   end
 
   depends_on "cmake" => [:build, :test]

diff --git a/Formula/t/tbb.rb b/Formula/t/tbb.rb
@@ -1,24 +1,23 @@
 class Tbb < Formula
   desc "Rich and complete approach to parallelism in C++"
   homepage "https://github.com/oneapi-src/oneTBB"
-  url "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz"
-  sha256 "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b"
+  url "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.11.0.tar.gz"
+  sha256 "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363"
   license "Apache-2.0"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "82aedbedc4f01d9e859ec0c0702a04cd61c300c9e6941239e8eae120eff4bd57"
-    sha256 cellar: :any,                 arm64_ventura:  "111d9a40d50f16615cfa8d543aba48d55482b4b234154a172309bf62c5a5d2d6"
-    sha256 cellar: :any,                 arm64_monterey: "beefab871bae0c31c9ced93653db9f3d4ee0e77c708252aae7a395560bd8e8ff"
-    sha256 cellar: :any,                 arm64_big_sur:  "e4d19bdf3991e80b81217bd45f770acab8841f1701a004ece15d2e581b34e2d3"
-    sha256 cellar: :any,                 sonoma:         "eb9180328e0efdc0426cbb08ca79d736c2796c68f9d260a43cf5406409201968"
-    sha256 cellar: :any,                 ventura:        "54c8bbc3954d70aaa5c37ff01c64e4d5873c96f9f9c87442e13d11c00e5a6436"
-    sha256 cellar: :any,                 monterey:       "18759017f100a1a974c7126577d06ce8a18fcc0b4ae0d448c692b7d38ac6db93"
-    sha256 cellar: :any,                 big_sur:        "ea0fbb62658f0179c96b309eafe7068434c131bf89926f02f9e89c7daf5a0de5"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "6071625843f701c8a904882b90f647ab0e7307656bec78f4066430639b1b866a"
+    sha256 cellar: :any,                 arm64_sonoma:   "54cfc46133d37fade8f3404d4be73127527cad56dc8212fd887885cc9440f613"
+    sha256 cellar: :any,                 arm64_ventura:  "c11a0e3e69cab1208064730e23f3c5b16e85755ec3067772c5a07dc773b8df8f"
+    sha256 cellar: :any,                 arm64_monterey: "9fd02a5e37c68c94315a89c194595d5f1b8d5faad760d2848c56f37deebbe182"
+    sha256 cellar: :any,                 sonoma:         "463e36411facadf4fe22376cc124dca6d69f46659635bdceb3609a147181f6ea"
+    sha256 cellar: :any,                 ventura:        "2c361a6bc460ad91b491ee27e25402749d346f80878d7ff97148e41ff049854f"
+    sha256 cellar: :any,                 monterey:       "9dcd86957cfa389c4d9c70794a0da08b2a5b623b1f465a7ed958f4a3b7da9b88"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "a76dd7893a0959e0b82dc2abf0e24c27ead22f574cf272a593cb5ba374242b4a"
   end
 
   depends_on "cmake" => :build
-  depends_on "[email protected]" => [:build, :test]
+  depends_on "python-setuptools" => :build
+  depends_on "[email protected]" => [:build, :test]
   depends_on "swig" => :build
 
   on_linux do
@@ -31,12 +30,12 @@ class Tbb < Formula
   patch :DATA
 
   def python3
-    "python3.11"
+    "python3.12"
   end
 
   def install
     # Prevent `setup.py` from installing tbb4py directly into HOMEBREW_PREFIX.
-    # We need this due to our `[email protected]` patch.
+    # We need this due to our Python patch.
     site_packages = Language::Python.site_packages(python3)
     inreplace "python/CMakeLists.txt", "@@SITE_PACKAGES@@", site_packages
 
@@ -67,11 +66,6 @@ def install
 
       system python3, "-m", "pip", "install", *std_pip_args, "."
     end
-
-    return unless OS.linux?
-
-    inreplace_files = prefix.glob("rml/CMakeFiles/irml.dir/{flags.make,build.make,link.txt}")
-    inreplace inreplace_files, Superenv.shims_path/ENV.cxx, ENV.cxx
   end
 
   test do
@@ -136,23 +130,24 @@ def install
 
 __END__
 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 1d2b05f..81ba8de 100644
+index 748921a5..d03fdc6f 100644
 --- a/python/CMakeLists.txt
 +++ b/python/CMakeLists.txt
 @@ -40,7 +40,7 @@ add_custom_target(
      ${PYTHON_EXECUTABLE} ${PYTHON_BUILD_WORK_DIR}/setup.py
          build -b${PYTHON_BUILD_WORK_DIR}
          build_ext ${TBB4PY_INCLUDE_STRING} -L$<TARGET_FILE_DIR:TBB::tbb>
--        install --prefix ${PYTHON_BUILD_WORK_DIR}/build -f
-+        install --prefix ${PYTHON_BUILD_WORK_DIR}/build --install-lib ${PYTHON_BUILD_WORK_DIR}/build/@@SITE_PACKAGES@@ -f
+-        install --prefix build -f
++        install --prefix build --install-lib ${PYTHON_BUILD_WORK_DIR}/build/@@SITE_PACKAGES@@ -f
      COMMENT "Build and install to work directory the oneTBB Python module"
  )
 
-@@ -49,7 +49,7 @@ add_test(NAME python_test
+@@ -50,7 +50,7 @@ add_test(NAME python_test
                   -DPYTHON_MODULE_BUILD_PATH=${PYTHON_BUILD_WORK_DIR}/build
                   -P ${PROJECT_SOURCE_DIR}/cmake/python/test_launcher.cmake)
-
+ 
 -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_BUILD_WORK_DIR}/build/
 +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_BUILD_WORK_DIR}/
          DESTINATION .
          COMPONENT tbb4py)
+