diff options
Diffstat (limited to 'Library')
| l--------- | Library/ENV/pkgconfig/10.4 | 1 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.5/libcrypto.pc (renamed from Library/ENV/pkgconfig/leopard/libcrypto.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.5/libcurl.pc (renamed from Library/ENV/pkgconfig/leopard/libcurl.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.8/libcurl.pc (renamed from Library/ENV/pkgconfig/mountain_lion/libcurl.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.8/libexslt.pc (renamed from Library/ENV/pkgconfig/mountain_lion/libexslt.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.8/libxml-2.0.pc (renamed from Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc) | 0 | ||||
| -rw-r--r-- | Library/ENV/pkgconfig/10.8/libxslt.pc (renamed from Library/ENV/pkgconfig/mountain_lion/libxslt.pc) | 0 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 3 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 3 |
9 files changed, 3 insertions, 4 deletions
diff --git a/Library/ENV/pkgconfig/10.4 b/Library/ENV/pkgconfig/10.4 new file mode 120000 index 000000000..41c25a186 --- /dev/null +++ b/Library/ENV/pkgconfig/10.4 @@ -0,0 +1 @@ +10.5
\ No newline at end of file diff --git a/Library/ENV/pkgconfig/leopard/libcrypto.pc b/Library/ENV/pkgconfig/10.5/libcrypto.pc index 26cd08be3..26cd08be3 100644 --- a/Library/ENV/pkgconfig/leopard/libcrypto.pc +++ b/Library/ENV/pkgconfig/10.5/libcrypto.pc diff --git a/Library/ENV/pkgconfig/leopard/libcurl.pc b/Library/ENV/pkgconfig/10.5/libcurl.pc index a93a80294..a93a80294 100644 --- a/Library/ENV/pkgconfig/leopard/libcurl.pc +++ b/Library/ENV/pkgconfig/10.5/libcurl.pc diff --git a/Library/ENV/pkgconfig/mountain_lion/libcurl.pc b/Library/ENV/pkgconfig/10.8/libcurl.pc index cb2ebf4a5..cb2ebf4a5 100644 --- a/Library/ENV/pkgconfig/mountain_lion/libcurl.pc +++ b/Library/ENV/pkgconfig/10.8/libcurl.pc diff --git a/Library/ENV/pkgconfig/mountain_lion/libexslt.pc b/Library/ENV/pkgconfig/10.8/libexslt.pc index c0b5f22da..c0b5f22da 100644 --- a/Library/ENV/pkgconfig/mountain_lion/libexslt.pc +++ b/Library/ENV/pkgconfig/10.8/libexslt.pc diff --git a/Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc b/Library/ENV/pkgconfig/10.8/libxml-2.0.pc index b2aac2a8b..b2aac2a8b 100644 --- a/Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc +++ b/Library/ENV/pkgconfig/10.8/libxml-2.0.pc diff --git a/Library/ENV/pkgconfig/mountain_lion/libxslt.pc b/Library/ENV/pkgconfig/10.8/libxslt.pc index 60fdd436c..60fdd436c 100644 --- a/Library/ENV/pkgconfig/mountain_lion/libxslt.pc +++ b/Library/ENV/pkgconfig/10.8/libxslt.pc diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index c8b567239..ff51ced66 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -69,8 +69,7 @@ module HomebrewEnvExtension paths = [] paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig' - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/mountain_lion' if MacOS.version >= :mountain_lion - paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/leopard' if MacOS.version <= :leopard + paths << HOMEBREW_REPOSITORY/"Library/ENV/pkgconfig/#{MacOS.version}" paths << '/usr/lib/pkgconfig' paths.select { |d| File.directory? d }.join(':') end diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 79e8a396b..36dead356 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -127,8 +127,7 @@ class << ENV paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" # we put our paths before X because we dupe some of the X libraries paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11? - # Mountain Lion no longer ships some .pcs; ensure we pick up our versions - paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion + paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}" paths.to_path_s end |