From 34bbcac420993a22e2475c3a7cc06d434f967e3e Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sat, 13 Apr 2024 03:09:26 +0800 Subject: [PATCH 1/4] tbb 2021.12.0 --- .github/autobump.txt | 1 + Formula/t/tbb.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/autobump.txt b/.github/autobump.txt index b6d26662405e..d47763a64aae 100644 --- a/.github/autobump.txt +++ b/.github/autobump.txt @@ -1877,6 +1877,7 @@ talhelper talisman tanka taplo +tbb tcl-tk tcsh tctl diff --git a/Formula/t/tbb.rb b/Formula/t/tbb.rb index 6143a18753be..eaab22882cce 100644 --- a/Formula/t/tbb.rb +++ b/Formula/t/tbb.rb @@ -1,8 +1,8 @@ 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.11.0.tar.gz" - sha256 "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363" + url "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.12.0.tar.gz" + sha256 "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f" license "Apache-2.0" bottle do From 3acef5697d8d2f6ab4cc91e2b26e925da9c41543 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sat, 13 Apr 2024 07:17:08 +0800 Subject: [PATCH 2/4] opencascade: revision bump (tbb 2021.12.0) Also, patch its CMake config files to avoid rebuilding upon tbb updates. --- Formula/o/opencascade.rb | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/Formula/o/opencascade.rb b/Formula/o/opencascade.rb index 5d84855a5524..e662b31f7460 100644 --- 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 3 + revision 4 # The first-party download page (https://dev.opencascade.org/release) # references version 7.5.0 and hasn't been updated for later maintenance @@ -72,6 +72,32 @@ def install system "cmake", "--build", "build" system "cmake", "--install", "build" + # The soname / install name of libtbb and libtbbmalloc are versioned only + # by the minor version (e.g., `libtbb.so.12`), but Open CASCADE's CMake + # config files reference the fully-versioned filenames (e.g., + # `libtbb.so.12.11`). + # This mandates rebuilding opencascade upon tbb's minor version updates. + # To avoid this, we change the fully-versioned references to the minor-only + # version. For example: + # libtbb.so.12.11 => libtbb.so.12 + # libtbbmalloc.so.2.11 => libtbbmalloc.so.2 + # libtbb.12.11.dylib => libtbb.12.dylib + # libtbbmalloc.2.11.dylib => libtbbmalloc.2.dylib + # See also: + # https://github.com/Homebrew/homebrew-core/issues/129111 + # https://dev.opencascade.org/content/cmake-files-macos-link-non-existent-libtbb128dylib + tbb_regex = / + libtbb + (malloc)? # 1 + (\.so)? # 2 + \.(\d+) # 3 + \.(\d+) # 4 + (\.dylib)? # 5 + /x + inreplace (lib/"cmake/opencascade").glob("*.cmake") do |s| + s.gsub! tbb_regex, 'libtbb\1\2.\3\5', false + end + bin.env_script_all_files(libexec, CASROOT: prefix) # Some apps expect resources in legacy ${CASROOT}/src directory @@ -85,8 +111,6 @@ def install assert_equal "1", output.split("\n", 2)[1].chomp # Make sure hardcoded library name references in our CMake config files are valid. - # https://github.com/Homebrew/homebrew-core/issues/129111 - # https://dev.opencascade.org/content/cmake-files-macos-link-non-existent-libtbb128dylib (testpath/"CMakeLists.txt").write <<~CMAKE cmake_minimum_required(VERSION 3.5) project(test LANGUAGES CXX) From 029de2514455bb00b99d0785896fdfdc58882293 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 14 Apr 2024 10:20:51 +0000 Subject: [PATCH 3/4] opencascade: update 7.7.2_4 bottle. --- Formula/o/opencascade.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/o/opencascade.rb b/Formula/o/opencascade.rb index e662b31f7460..586740053195 100644 --- a/Formula/o/opencascade.rb +++ b/Formula/o/opencascade.rb @@ -21,13 +21,13 @@ class Opencascade < Formula end bottle do - sha256 cellar: :any, arm64_sonoma: "eb9808875fec8e1ca5f80d97959e38cee9d224589a846eaa78f25ea7199363d7" - sha256 cellar: :any, arm64_ventura: "c5d9ea960850f4d532ab06d98e53760fd2764348a2d5d3c26809571f5e23d6ad" - sha256 cellar: :any, arm64_monterey: "cb4e9713df84d22209ec461ebffccd362ddc50d94334c60c1216c1c513b4b22a" - sha256 cellar: :any, sonoma: "e1cee0b2983fd140e7da2227b4ec43cd221b9ecbcddb4e9aa919e9b62e504334" - sha256 cellar: :any, ventura: "49a241949374fa04f3c6937bb59f7abfd525481d2b4886ceed2dd54ed9a4177d" - sha256 cellar: :any, monterey: "62cf8aed6468f9ba9820f13dad4d393326137a90a62f6bb8e069c9992bc776e4" - sha256 cellar: :any_skip_relocation, x86_64_linux: "c867bb275811aa102d3da70c979abb1938c8db206ee9da339366efc95aa9118e" + sha256 cellar: :any, arm64_sonoma: "d943fcf559ec121ef458209e848f42ded0ee293be5e420210207098627511b99" + sha256 cellar: :any, arm64_ventura: "48a51a8264dcd534b3d8598e0b4f6703183151ec9f90706d19e039aab3d40c52" + sha256 cellar: :any, arm64_monterey: "b91b3734788912a10a59137925635d45820b7f9e16566a899a4ec2718503ba79" + sha256 cellar: :any, sonoma: "627e3ae8871711e79e1212bfbd3dda93b19f998cbcb48714386d7e3c5084dc88" + sha256 cellar: :any, ventura: "4566d546ab5a26112dd0155ba7ab63e1f685b2a8e67c0ec2dc9ab3fd60fe09fd" + sha256 cellar: :any, monterey: "aa411b1a71ed7556a3e0efc1d3bd8df116b88b480510fb29942bcd38f553000f" + sha256 cellar: :any_skip_relocation, x86_64_linux: "cfa811c0b269317e024ea68eaaf5b8a81d78a1e5c2cfb053668af567b6fcb80e" end depends_on "cmake" => [:build, :test] From 2206d3ef24664bff7265a1c8d1b9b1a587c37d3e Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Sun, 14 Apr 2024 10:20:52 +0000 Subject: [PATCH 4/4] tbb: update 2021.12.0 bottle. --- Formula/t/tbb.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Formula/t/tbb.rb b/Formula/t/tbb.rb index eaab22882cce..444ce3e973aa 100644 --- a/Formula/t/tbb.rb +++ b/Formula/t/tbb.rb @@ -6,14 +6,13 @@ class Tbb < Formula license "Apache-2.0" bottle do - rebuild 1 - sha256 cellar: :any, arm64_sonoma: "c24bd15b42e0ae13e2cb12ac655a48719925625160e881ebe3f7106abe3c080d" - sha256 cellar: :any, arm64_ventura: "a648bac2b48fe462ccba3ba5791d753b01ecc5ec8ee84fa4b86f2e34e2d7442e" - sha256 cellar: :any, arm64_monterey: "e9ff0aba06130659e53186ff76c843e922eeba909c19ccb9d1c4274cc51dcc38" - sha256 cellar: :any, sonoma: "ac700eb4d553a63441a0b493aa30cd1b5b82d0d740293ae74e10d6f1f61c119d" - sha256 cellar: :any, ventura: "b467ab5ad3cc9139e861a3d40059e83cbbcc5cfdddf7b8474a866cdbc9fe3bb5" - sha256 cellar: :any, monterey: "757139751fed233518ed43992f0427b87cdf461459fd4ff2f6dabc759855acee" - sha256 cellar: :any_skip_relocation, x86_64_linux: "e3d73744e801e49bedfc00ad68838cd6299a50563bf69c270f2808ad51bd7562" + sha256 cellar: :any, arm64_sonoma: "1413cb9b7515eb9399c94b5530c998b27fb5ba70b1f183d8168175178827ee8c" + sha256 cellar: :any, arm64_ventura: "2501fbee6f73642893338977ae5e9911fd7bd6e793ed1388a7826aefc0c70e11" + sha256 cellar: :any, arm64_monterey: "aeca6be1f720719fd6f0dde64a85d060cfed6081d590d918128b92fc5b0254e9" + sha256 cellar: :any, sonoma: "afb040279f6198282c0348cf215d99e27dbc778c6629dc738c46b67336ed3167" + sha256 cellar: :any, ventura: "9da62541c8ccedf71ee94ecfd94eff95264d231841147534dae72347027a8dae" + sha256 cellar: :any, monterey: "b4e71f9855e51baf2309ec0bb9f0f6d721b8db67a0452bb195182fc2f9e261ad" + sha256 cellar: :any_skip_relocation, x86_64_linux: "89c7a9008491b2d1b4780c4fa5f15d46bee5354de2ea96ad34d5d38b2366ee42" end depends_on "cmake" => :build