Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

binwalk: re-enable build-isolation to remove build deps #166053

Merged
merged 2 commits into from
Mar 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions Formula/b/binwalk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,19 @@ class Binwalk < Formula
end

bottle do
rebuild 1
sha256 cellar: :any, arm64_sonoma: "b11c99d9b5fe06d0262a8e0bec6fb3306d9252e7b53e0a030f9b7e4881e6a8fc"
sha256 cellar: :any, arm64_ventura: "fde4acbed6f700d368f90140f78360bb61dafefa44e910e2d492e62a7b173496"
sha256 cellar: :any, arm64_monterey: "3a9ef464ee29362cfbdf223b3b886c63c80e194b18b2bfe9e0cb367770d26c6e"
sha256 cellar: :any, sonoma: "d19db31d50e4eab72290b55d5d142332ef09acef9ae4317844961a91486b9b40"
sha256 cellar: :any, ventura: "bc0e35dafe52870b7e907e9ca791f90e8f7ab23ce2aa07cbd29e5a995284d6e1"
sha256 cellar: :any, monterey: "1073e416ac5375f4504b2897c76f6e62cc98bdb9d30f3893149457e82f633f85"
sha256 cellar: :any_skip_relocation, x86_64_linux: "efbc1bfff4ac063ee5a86192599445eb56d3ba408df57a993730893469316f40"
end

depends_on "meson" => :build # for contourpy
depends_on "meson-python" => :build # for contourpy
depends_on "ninja" => :build # for contourpy
rebuild 2
sha256 cellar: :any, arm64_sonoma: "a9c16c0ea6712b324582b678a6bb0f89186229375b2167d35697c434a3fe831e"
sha256 cellar: :any, arm64_ventura: "cbc1609002b6673a9609f3af058428e3e71f3d517c66878e2fd02d4bae4732e2"
sha256 cellar: :any, arm64_monterey: "f76c9432dbfbe81f8f9031c10bde58f2deb41fad4397e45c788a541a936cf7a1"
sha256 cellar: :any, sonoma: "541c4dd02cc7f0455e49b54b83df80ff7aea921263d76a2b51afa3c13e3f6f98"
sha256 cellar: :any, ventura: "de5c3ab5d6f3fc81a341aadd5e5ad1f9d9e139598f7e3ecda1aa316f26f889d3"
sha256 cellar: :any, monterey: "c40d4df1e272b1d50970f969da0e1b889a8b7c70bf60406e12641217a068b481"
sha256 cellar: :any_skip_relocation, x86_64_linux: "1e23a0c1cfd5ccb70085fb00191d971b545c79d5dfc3aa2693b9a552665db0d5"
end

depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => :build
depends_on "pybind11" => :build # for contourpy and matplotlib
depends_on "swig" => :build
depends_on "freetype"
depends_on "libpng"
Expand All @@ -41,6 +39,10 @@ class Binwalk < Formula
depends_on "ssdeep"
depends_on "xz"

on_linux do
depends_on "patchelf" => :build
end

resource "capstone" do
url "https://files.pythonhosted.org/packages/7a/fe/e6cdc4ad6e0d9603fa662d1ccba6301c0cb762a1c90a42c7146a538c24e9/capstone-5.0.1.tar.gz"
sha256 "740afacc29861db591316beefe30df382c4da08dcb0345a0d10f0cac4f8b1ee2"
Expand Down Expand Up @@ -122,12 +124,7 @@ def install
system_qhull = true
EOS

venv = virtualenv_create(libexec, "python3.11")
venv.pip_install resource("kiwisolver") # needs `cppy` to build so keep build isolation
# We disable build isolation to make use of existing Homebrew formulae rather
# than rebuilding Python packages like `numpy` that are used by build-backend.
venv.pip_install(resources.reject { |r| r.name == "kiwisolver" }, build_isolation: false)
venv.pip_install_and_link(buildpath, build_isolation: false)
virtualenv_install_with_resources
end

test do
Expand Down
Loading