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

Merge pull request #6121 from tschoonj/meson-template-fixes

Browse Source 
formula_creator: fix meson template
This commit is contained in:
Mike McQuaid 2019-05-12 11:44:45 +01:00 committed by GitHub
commit 297e2225a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula_creator.rb
View File

@ -99,7 +99,7 @@ module Homebrew
<% if mode == :cmake %>
depends_on "cmake" => :build
<% elsif mode == :meson %>
depends_on "meson-internal" => :build
depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "python" => :build
<% elsif mode.nil? %>
@ -117,12 +117,10 @@ module Homebrew
"--disable-silent-rules",
"--prefix=\#{prefix}"
<% elsif mode == :meson %>
ENV.refurbish_args
mkdir "build" do
system "meson", "--prefix=\#{prefix}", ".."
system "ninja"
system "ninja", "install"
system "ninja", "-v"
system "ninja", "install", "-v"
end
<% else %>
# Remove unrecognized options if warned by configure