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

separate ENV/pkgconfig dirs by OS version

Browse Source 
Closes Homebrew/homebrew#16063.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Camillo Lugaresi 2012-11-14 14:08:34 -06:00 committed by Jack Nagel
parent cf7f0f250f
commit 5e39ce44fe
8 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Library/ENV/pkgconfigLeopard/libcrypto.pc → Library/ENV/pkgconfig/leopard/libcrypto.pc
View File

0
Library/ENV/pkgconfigLeopard/libcurl.pc → Library/ENV/pkgconfig/leopard/libcurl.pc
View File

0
Library/ENV/pkgconfig/libcurl.pc → Library/ENV/pkgconfig/mountain_lion/libcurl.pc
View File

0
Library/ENV/pkgconfig/libexslt.pc → Library/ENV/pkgconfig/mountain_lion/libexslt.pc
View File

0
Library/ENV/pkgconfig/libxml-2.0.pc → Library/ENV/pkgconfig/mountain_lion/libxml-2.0.pc
View File

0
Library/ENV/pkgconfig/libxslt.pc → Library/ENV/pkgconfig/mountain_lion/libxslt.pc
View File

4
Library/Homebrew/extend/ENV.rb
View File

@ -67,8 +67,8 @@ module HomebrewEnvExtension
paths = [] paths = []
paths << HOMEBREW_PREFIX/'lib/pkgconfig' paths << HOMEBREW_PREFIX/'lib/pkgconfig'
paths << HOMEBREW_PREFIX/'share/pkgconfig' paths << HOMEBREW_PREFIX/'share/pkgconfig'
paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig' if MacOS.version >= :mountain_lion paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/mountain_lion' if MacOS.version >= :mountain_lion
paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfigLeopard' if MacOS.version <= :leopard paths << HOMEBREW_REPOSITORY/'Library/ENV/pkgconfig/leopard' if MacOS.version <= :leopard
paths << '/usr/lib/pkgconfig' paths << '/usr/lib/pkgconfig'
paths.select { |d| File.directory? d }.join(':') paths.select { |d| File.directory? d }.join(':')
end end

2
Library/Homebrew/superenv.rb
View File

@ -121,7 +121,7 @@ class << ENV
# we put our paths before X because we dupe some of the X libraries # 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? 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 # Mountain Lion no longer ships some .pcs; ensure we pick up our versions
paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig" if MacOS.version >= :mountain_lion paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/mountain_lion" if MacOS.version >= :mountain_lion
paths.to_path_s paths.to_path_s
end end