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

git-annex: force-enable "webapp" flag

Browse Source 
To address issue Homebrew/homebrew#47346 (git-annex-webapp missing), we explicitly
enable the "webapp" flag for git-annex. This should prevent git-annex
from being built without the webapp and make the build fail if there is
e.g. a dependency issue.

Closes Homebrew/homebrew#47950.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
Cedric Staub 2016-01-10 18:31:55 -08:00 committed by Dominyk Tiller
parent bb37aa2824
commit cc3e2e8f0f
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/language/haskell.rb
View File

@ -54,6 +54,10 @@ module Language
system "cabal", "install", "--jobs=#{ENV.make_jobs}", "--max-backjumps=100000", *args system "cabal", "install", "--jobs=#{ENV.make_jobs}", "--max-backjumps=100000", *args
end end
def cabal_configure(flags)
system "cabal", "configure", flags
end
def cabal_install_tools(*tools) def cabal_install_tools(*tools)
# install tools sequentially, as some tools can depend on other tools # install tools sequentially, as some tools can depend on other tools
tools.each { |tool| cabal_install tool } tools.each { |tool| cabal_install tool }
@ -69,8 +73,21 @@ module Language
cabal_sandbox do cabal_sandbox do
cabal_install_tools(*options[:using]) if options[:using] cabal_install_tools(*options[:using]) if options[:using]
# if we have build flags, we have to pass them to cabal install to resolve the necessary
# dependencies, and call cabal configure afterwards to set the flags again for compile
flags = ""
if options[:flags]
flags = "--flags='#{options[:flags].join(" ")}'"
end
args_and_flags = args
args_and_flags << flags
# install dependencies in the sandbox # install dependencies in the sandbox
cabal_install "--only-dependencies", *args cabal_install "--only-dependencies", *args_and_flags
# call configure if build flags are set
cabal_configure flags unless flags.empty?
# install the main package in the destination dir # install the main package in the destination dir
cabal_install "--prefix=#{prefix}", *args cabal_install "--prefix=#{prefix}", *args