Skip to content

Commit 2de2a78

Browse files
committed
meson: build an :all bottle
There are still some stray `/usr/local` and `/opt/homebrew` references that we can make the same across all our bottles.
1 parent e6dbbc1 commit 2de2a78

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

Formula/m/meson.rb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,26 @@ def install
3232
# Make the bottles uniform. This also ensures meson checks `HOMEBREW_PREFIX`
3333
# for fulfilling dependencies rather than just `/usr/local`.
3434
mesonbuild = prefix/Language::Python.site_packages(python3)/"mesonbuild"
35-
inreplace_files = %w[
35+
usr_local_files = %w[
3636
coredata.py
37+
options.py
3738
dependencies/boost.py
3839
dependencies/cuda.py
3940
dependencies/qt.py
4041
scripts/python_info.py
4142
utils/universal.py
43+
compilers/mixins/apple.py
4244
].map { |f| mesonbuild/f }
43-
inreplace_files << (bash_completion/"meson")
45+
usr_local_files << (bash_completion/"meson")
4446

4547
# Passing `build.stable?` ensures a failed `inreplace` won't fail HEAD installs.
46-
inreplace inreplace_files, "/usr/local", HOMEBREW_PREFIX, build.stable?
48+
inreplace usr_local_files, "/usr/local", HOMEBREW_PREFIX, audit_result: build.stable?
49+
50+
opt_homebrew_files = %w[dependencies/boost.py compilers/mixins/apple.py].map { |f| mesonbuild/f }
51+
inreplace opt_homebrew_files, "/opt/homebrew", HOMEBREW_PREFIX, audit_result: build.stable?
52+
53+
# Ensure meson uses our `var` directory.
54+
inreplace mesonbuild/"options.py", "'/var/local", "'#{var}", audit_result: build.stable?
4755
end
4856

4957
test do

0 commit comments

Comments
 (0)