From 17f43e14c63a65e8733e7fb3e6b281dde3305908 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Thu, 4 Apr 2024 11:34:42 -0400 Subject: [PATCH 1/2] uutils-findutils 0.5.0 autobump: add uutils-findutils Signed-off-by: Rui Chen uutils-findutils: update build Signed-off-by: Rui Chen --- .github/autobump.txt | 1 + Formula/u/uutils-findutils.rb | 25 ++++--------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.github/autobump.txt b/.github/autobump.txt index 73f577072009..e3e6a46829b6 100644 --- a/.github/autobump.txt +++ b/.github/autobump.txt @@ -1902,6 +1902,7 @@ universal-ctags usb.ids usbredir uutils-coreutils +uutils-findutils uuu uv uvicorn diff --git a/Formula/u/uutils-findutils.rb b/Formula/u/uutils-findutils.rb index 23f19b5b0da2..b5f32bb49ddf 100644 --- a/Formula/u/uutils-findutils.rb +++ b/Formula/u/uutils-findutils.rb @@ -1,8 +1,8 @@ class UutilsFindutils < Formula desc "Cross-platform Rust rewrite of the GNU findutils" homepage "https://github.com/uutils/findutils" - url "https://github.com/uutils/findutils/archive/refs/tags/0.4.2.tar.gz" - sha256 "b02fce9219393b47384229b397c7fbe479435ae8ccf8947f4b6cf7ac159d80f9" + url "https://github.com/uutils/findutils/archive/refs/tags/0.5.0.tar.gz" + sha256 "609ab3fdbf5a3ec8c3a3f014715d3f930e55a217915871a2861e0567c7be76d5" license "MIT" head "https://github.com/uutils/findutils.git", branch: "main" @@ -17,15 +17,12 @@ class UutilsFindutils < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "c81b5f592d7e87310bbf175f5890e0e18a0177d2c819447021576bf8691f22a6" end - # Use `llvm@15` to work around build failure with Clang 16 described in - # https://github.com/rust-lang/rust-bindgen/issues/2312. - # TODO: Switch back to `uses_from_macos "llvm" => :build` when `bindgen` is - # updated to 0.62.0 or newer. There is a check in the `install` method. - depends_on "llvm@15" => :build # for libclang depends_on "pkg-config" => :build depends_on "rust" => :build depends_on "oniguruma" + uses_from_macos "llvm" => :build + def unwanted_bin_link?(cmd) %w[ testing-commandline @@ -33,20 +30,6 @@ def unwanted_bin_link?(cmd) end def install - bindgen_version = Version.new( - (buildpath/"Cargo.lock").read - .match(/name = "bindgen"\nversion = "(.*)"/)[1], - ) - if bindgen_version >= "0.62.0" - odie "`bindgen` crate is updated to 0.62.0 or newer! Please remove " \ - 'this check and try switching to `uses_from_macos "llvm" => :build`.' - end - - # Work around an Xcode 15 linker issue which causes linkage against LLVM's - # libunwind due to it being present in a library search path. - ENV.remove "HOMEBREW_LIBRARY_PATHS", Formula["llvm@15"].opt_lib - - ENV["LIBCLANG_PATH"] = Formula["llvm@15"].opt_lib.to_s ENV["RUSTONIG_DYNAMIC_LIBONIG"] = "1" ENV["RUSTONIG_SYSTEM_LIBONIG"] = "1" From bb1816908e28ede0ea90694e2ed1db57fdf0bdd9 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:52:31 +0000 Subject: [PATCH 2/2] uutils-findutils: update 0.5.0 bottle. --- Formula/u/uutils-findutils.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Formula/u/uutils-findutils.rb b/Formula/u/uutils-findutils.rb index b5f32bb49ddf..404a6a64df08 100644 --- a/Formula/u/uutils-findutils.rb +++ b/Formula/u/uutils-findutils.rb @@ -7,14 +7,13 @@ class UutilsFindutils < Formula head "https://github.com/uutils/findutils.git", branch: "main" bottle do - rebuild 2 - sha256 cellar: :any, arm64_sonoma: "c9b20a92a27ec6e59d85ea2c7504c7b6b742a8fbce18584add667691bd8ed3a7" - sha256 cellar: :any, arm64_ventura: "8be60da1dbce8c62f921e9906b76a9f3384b0f6e7d912a26afd633ac694889a2" - sha256 cellar: :any, arm64_monterey: "a6a59cb7c7e765c4df4135ddcd8766f676e70d5c08dc004f744e598bfba3481f" - sha256 cellar: :any, sonoma: "9b65bda73278dfffcb6977d9e5771bb0134050937b1b181bcee4a2308817e9d2" - sha256 cellar: :any, ventura: "a3bc5fead8a81e9c9cf771ac931f204b4fa258be83a14ffd3648c9e5267784e5" - sha256 cellar: :any, monterey: "ca68615f9cdca938f9a3d45833207603fd8a2fc9217c86fe0e79857e00c6ed8b" - sha256 cellar: :any_skip_relocation, x86_64_linux: "c81b5f592d7e87310bbf175f5890e0e18a0177d2c819447021576bf8691f22a6" + sha256 cellar: :any, arm64_sonoma: "12b5ed3eac76496fa83f17702d24b11780c8c4031ad0b7f533f2d1417cbe59d2" + sha256 cellar: :any, arm64_ventura: "2efbfd98b7bd2f911537e1678efdebbd220301c5f9a432add77e03a2dd3b06a4" + sha256 cellar: :any, arm64_monterey: "77f731f7daf405a9c353383908404522b28696f044d1ca4f5b350a7ec2395ffe" + sha256 cellar: :any, sonoma: "0aa0883840290ac57612e718cb96757bc455f563be3124d01fbd8b86dea6d28e" + sha256 cellar: :any, ventura: "74aef463704c438d36d16da8673a575e9d154143282fb17644f6b3f8097f312e" + sha256 cellar: :any, monterey: "53c8dd5b4120465a9befd73b93894d35d5534e2d8d1c44acdfd82df4b167e382" + sha256 cellar: :any_skip_relocation, x86_64_linux: "786493398d788145040daa91d3f72f1cf53184bb318edb070c8fc88df5fba2a0" end depends_on "pkg-config" => :build