From 00ba4dfd1ee1db446f1fdf9ed0b95efa61b7c3d2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 2 Aug 2012 16:52:33 +0100 Subject: Fix Mountain Lion sed by setting LANG. It's also necessary to delete LC_ALL or it overrides the new LANG. LC_COLLATE is the problem variable but is affected by LANG and LC_ALL so just use them instead. Extends the fix made to geoip in dc955c. Fix #11728, fix #12890, fix #13653, fix #13734, fix #13787, fix #13818. --- Library/Formula/geoip.rb | 2 -- Library/Homebrew/extend/ENV.rb | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Library') diff --git a/Library/Formula/geoip.rb b/Library/Formula/geoip.rb index 334799bf1..b289bcc00 100644 --- a/Library/Formula/geoip.rb +++ b/Library/Formula/geoip.rb @@ -14,8 +14,6 @@ class Geoip < Formula end def install - # Fix issue with sed barfing on unicode characters on Mountain Lion. - ENV.delete('LANG') ENV.universal_binary if ARGV.build_universal? # Fixes a build error on Lion when configure does a variant of autoreconf diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index b6240d8e3..b07e6d006 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -9,8 +9,12 @@ module HomebrewEnvExtension delete('CLICOLOR_FORCE') # autotools doesn't like this remove_cc_etc - # Mountain Lion no longer ships a few .pcs; make sure we pick up our versions if MacOS.mountain_lion? + # Fix issue with sed barfing on unicode characters on Mountain Lion. + delete('LC_ALL') + self['LANG']="C" + + # Mountain Lion no longer ships a few .pcs; make sure we pick up our versions prepend 'PKG_CONFIG_PATH', HOMEBREW_REPOSITORY/'Library/Homebrew/pkgconfig', ':' end -- cgit v1.2.3