From 2f574bda721dc67aefcca79d4f8bd060061342ed Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 27 Nov 2013 08:49:34 +0000 Subject: [PATCH] git: fix git-svn on 10.9. Fixes Homebrew/homebrew#23587. Closes Homebrew/homebrew#24686. --- Formula/git.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Formula/git.rb b/Formula/git.rb index c8bc301157b..b6455ec1843 100644 --- a/Formula/git.rb +++ b/Formula/git.rb @@ -35,6 +35,17 @@ class Git < Formula sha1 'eb4eb4991464f44deda19d1435d9721146587661' end + def patches + if MacOS.version >= :mavericks + # Allow using PERLLIB_EXTRA to find Subversion Perl bindings location + # in the CLT/Xcode. Should be included in Git 1.8.6. + # https://git.kernel.org/cgit/git/git.git/commit/?h=next&id=07981d + # https://git.kernel.org/cgit/git/git.git/commit/?h=next&id=0386dd + ['https://git.kernel.org/cgit/git/git.git/patch/?id=07981d', + 'https://git.kernel.org/cgit/git/git.git/patch/?id=0386dd'] + end + end + def install # If these things are installed, tell Git build system to not use them ENV['NO_FINK'] = '1' @@ -44,6 +55,10 @@ class Git < Formula ENV['PYTHON_PATH'] = python.binary if python ENV['PERL_PATH'] = which 'perl' + if MacOS.version >= :mavericks and MacOS.dev_tools_prefix + ENV['PERLLIB_EXTRA'] = "#{MacOS.dev_tools_prefix}/Library/Perl/5.16/darwin-thread-multi-2level" + end + unless quiet_system ENV['PERL_PATH'], '-e', 'use ExtUtils::MakeMaker' ENV['NO_PERL_MAKEMAKER'] = '1' end