From 3b781632cd5636ee0336e70762296e5af76ca8ea Mon Sep 17 00:00:00 2001 From: Alexander Altman Date: Thu, 2 Apr 2015 20:34:36 -0700 Subject: [PATCH] git-annex 5.20150522 Also removes the `gmp` dependency, and greatly modernizes the formula. Closes Homebrew/homebrew#38329. Signed-off-by: Mike McQuaid --- Formula/git-annex.rb | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index a65991411e..3d2c210766 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -4,8 +4,8 @@ class GitAnnex < Formula include Language::Haskell::Cabal homepage "https://git-annex.branchable.com/" - url "https://hackage.haskell.org/package/git-annex-5.20150205/git-annex-5.20150205.tar.gz" - sha1 "5df6114cb029531e429e2b423f5ae7f755ffa390" + url "https://hackage.haskell.org/package/git-annex-5.20150522/git-annex-5.20150522.tar.gz" + sha256 "77208899616ed973dca26137534533f03636af6314cbdbfdc3e4e51c5efeec6a" bottle do cellar :any @@ -14,33 +14,32 @@ class GitAnnex < Formula sha1 "bf687c017b26ac5694e466afd8fe996c7ea2c22b" => :mountain_lion end - depends_on "gcc" => :build + option "with-git-union-merge", "Build the git-union-merge tool" + depends_on "ghc" => :build depends_on "cabal-install" => :build depends_on "pkg-config" => :build - # wget is workaround for http://git-annex.branchable.com/bugs/Build_fails_when_no_wget_avalible/ - depends_on "wget" => :build depends_on "gsasl" depends_on "libidn" depends_on "gnutls" - depends_on "gmp" depends_on "quvi" - fails_with(:clang) { build 425 } # clang segfaults on Lion - def install cabal_sandbox do cabal_install_tools "alex", "happy", "c2hs" - # gcc required to build gnuidn - gcc = Formula["gcc"] - cabal_install "--with-gcc=#{gcc.bin}/gcc-#{gcc.version_suffix}", - "--only-dependencies", - "--constraint=utf8-string==0.3.8" # use older utf8-string until 'feed' is updated + cabal_install "--only-dependencies" cabal_install "--prefix=#{prefix}" + + # this can be made the default behavior again once git-union-merge builds properly when bottling + if build.with? "git-union-merge" + system "make", "git-union-merge", "PREFIX=#{prefix}" + bin.install "git-union-merge" + system "make", "git-union-merge.1", "PREFIX=#{prefix}" + end + + system "make", "install-docs", "PREFIX=#{prefix}" end - bin.install_symlink "git-annex" => "git-annex-shell" - system "make", "git-annex.1", "git-annex-shell.1", "git-union-merge.1" - man1.install "git-annex.1", "git-annex-shell.1", "git-union-merge.1" + cabal_clean_lib end test do