admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7364 from iMichka/meson

Browse Source 
formula: add standard meson args
This commit is contained in:
Mike McQuaid 2020-04-15 16:17:45 +01:00 committed by GitHub
commit 25dacf7d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula.rb
View File

@ -1373,6 +1373,11 @@ class Formula
["--jobs=#{ENV.make_jobs}", "--max-backjumps=100000", "--install-method=copy", "--installdir=#{bin}"] ["--jobs=#{ENV.make_jobs}", "--max-backjumps=100000", "--install-method=copy", "--installdir=#{bin}"]
end end
# Standard parameters for meson builds.
def std_meson_args
["--prefix=#{prefix}", "--libdir=#{lib}"]
end
# an array of all core {Formula} names # an array of all core {Formula} names
# @private # @private
def self.core_names def self.core_names

2
Library/Homebrew/formula_creator.rb
View File

@ -142,7 +142,7 @@ module Homebrew
system "go", "build", *std_go_args system "go", "build", *std_go_args
<% elsif mode == :meson %> <% elsif mode == :meson %>
mkdir "build" do mkdir "build" do
system "meson", "--prefix=\#{prefix}", ".." system "meson", *std_meson_args, ".."
system "ninja", "-v" system "ninja", "-v"
system "ninja", "install", "-v" system "ninja", "install", "-v"
end end