Skip to content

Commit 0b124c0

Browse files
authored
Merge pull request Homebrew#218690 from Homebrew/webtorrent-cli-update
webtorrent-cli: fix build
2 parents 11b425d + 01fe066 commit 0b124c0

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

Formula/w/webtorrent-cli.rb

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,25 @@ class WebtorrentCli < Formula
66
license "MIT"
77

88
bottle do
9-
sha256 arm64_sequoia: "2f51039320fd1f4c65622c16387998ea51c75e9cc686f2f28e3f4c8d487948ee"
10-
sha256 arm64_sonoma: "5426246ae8ca317d1400c9c303b8b31fb38ccbe53c29c450b6258203d0ab4aa1"
11-
sha256 arm64_ventura: "255d4b3c1c1f5637c67841c04df5b77d515f2f3aef49fbebd9c1d701b853bb63"
12-
sha256 sonoma: "2e1bb535aa93a68bbaa5da0dd2317ce6e76b7b2ddc325ac13052214fac5fe4c2"
13-
sha256 ventura: "e690cb2c937766b9d500d255f79518937ac010c12a35586f4739e012a7d950b1"
14-
sha256 x86_64_linux: "7684212b75eba13057dada394e1658bfb06d061b67da5e90809837c590eb1eb3"
9+
rebuild 1
10+
sha256 arm64_sequoia: "eb96a6e72f8c04344827b1d098938557cc110c58086e09e725bb6baa2c4f5439"
11+
sha256 arm64_sonoma: "e0d8b93558e6684dd9b06357cdaec1bf680f34e825cda653e981674c6c31e796"
12+
sha256 arm64_ventura: "abe70e531a96d75b7ce514492dd43605e27b9276d210601f31a32624fe72af8c"
13+
sha256 sonoma: "fbe60e713aca44e2adc2ae4d50f2d93f6053047a90820c3ae620e142916180b0"
14+
sha256 ventura: "3f1f6158f5f07a5fce88a6c6497596da89c17fe438a761332921e4346c227f15"
15+
sha256 x86_64_linux: "c36c64165586a9af662fa923e602821e649bee2a5fda5563c5de109e6429a9c1"
1516
end
1617

1718
depends_on "cmake" => :build
1819
depends_on "ninja" => :build
19-
depends_on "node"
20+
# Using Node 20 due to issue with N-API 10 https://github.com/murat-dogan/node-datachannel/issues/333
21+
# and unable to use newer node-datachannel https://github.com/ThaUnknown/webrtc-polyfill/issues/9
22+
depends_on "node@20"
2023

2124
def install
25+
# Workaround for CMake 4 until node-datachannel -> libdatachannel -> plog is updated
26+
ENV["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5"
27+
2228
system "npm", "install", *std_npm_args
2329
bin.install_symlink Dir["#{libexec}/bin/*"]
2430

@@ -29,8 +35,8 @@ def install
2935
rm [
3036
sb/"CMakeFiles/CMakeConfigureLog.yaml",
3137
sb/"CMakeFiles/rules.ninja",
32-
sb/"CMakeFiles/3.31.2/CMakeCXXCompiler.cmake",
33-
sb/"CMakeFiles/3.31.2/CMakeCCompiler.cmake",
38+
sb/"CMakeFiles/#{Formula["cmake"].version}/CMakeCXXCompiler.cmake",
39+
sb/"CMakeFiles/#{Formula["cmake"].version}/CMakeCCompiler.cmake",
3440
sb/"_deps/libdatachannel-subbuild/CMakeLists.txt",
3541
sb/"_deps/libdatachannel-subbuild/libdatachannel-populate-prefix/tmp/libdatachannel-populate-gitclone.cmake",
3642
sb/"_deps/libdatachannel-subbuild/libdatachannel-populate-prefix/tmp/libdatachannel-populate-gitupdate.cmake",
@@ -40,9 +46,11 @@ def install
4046
# Remove incompatible pre-built binaries
4147
os = OS.kernel_name.downcase
4248
arch = Hardware::CPU.intel? ? "x64" : Hardware::CPU.arch.to_s
43-
pb = nm/"{bare-fs,bare-os,bufferutil,fs-native-extensions,utp-native,utf-8-validate}"
49+
platforms = ["#{os}-#{arch}"]
50+
platforms << "#{os}-x64+arm64" if OS.mac?
51+
pb = nm/"{bare-fs,bare-os,bare-url,bufferutil,fs-native-extensions,utp-native,utf-8-validate}"
4452
libexec.glob(pb/"prebuilds/*").each do |dir|
45-
rm_r(dir) if dir.basename.to_s != "#{os}-#{arch}"
53+
rm_r(dir) if platforms.exclude?(dir.basename.to_s)
4654
dir.glob("*.musl.node").map(&:unlink) if OS.linux?
4755
end
4856

0 commit comments

Comments
 (0)