diff options
| author | Jack Nagel | 2013-03-08 18:14:00 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-03-09 14:46:01 -0600 |
| commit | 2cc9322fbd961f7b2587de481e7662e604903bbe (patch) | |
| tree | 95c7a049ae40d60e5afb5cfd16a0f5f6ffc6bce3 /Library/Homebrew | |
| parent | 878747d45881fafa64723284bb2fd769d94f722c (diff) | |
| download | brew-2cc9322fbd961f7b2587de481e7662e604903bbe.tar.bz2 | |
Exclude global pkgconfig dirs under superenv
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/--env.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb index 3afd1f797..770740c0f 100644 --- a/Library/Homebrew/cmd/--env.rb +++ b/Library/Homebrew/cmd/--env.rb @@ -21,10 +21,10 @@ module Homebrew extend self def build_env_keys env %w[ CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH - MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH HOMEBREW_BUILD_FROM_SOURCE + MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH PKG_CONFIG_LIBDIR HOMEBREW_DEBUG HOMEBREW_MAKE_JOBS HOMEBREW_VERBOSE HOMEBREW_USE_CLANG HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT - HOMEBREW_SDKROOT + HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE MAKE GIT CPP ACLOCAL_PATH OBJC PATH ].select{ |key| env.fetch(key) if env.key? key } end diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 36dead356..cd19b8ed0 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -49,6 +49,7 @@ class << ENV ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" ENV['PATH'] = determine_path ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path + ENV['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir ENV['HOMEBREW_CC'] = determine_cc ENV['HOMEBREW_CCCFG'] = determine_cccfg ENV['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE @@ -123,11 +124,12 @@ class << ENV def determine_pkg_config_path paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/lib/pkgconfig" } paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/pkgconfig" } - paths << "#{HOMEBREW_PREFIX}/lib/pkgconfig" - paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" - # we put our paths before X because we dupe some of the X libraries + paths.to_path_s + end + + def determine_pkg_config_libdir + paths = %W{/usr/lib/pkgconfig #{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}} paths << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11? - paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}" paths.to_path_s end |