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

Exclude global pkgconfig dirs under superenv

Browse Source
This commit is contained in:
Jack Nagel 2013-03-08 18:14:00 -06:00
parent 878747d458
commit 2cc9322fbd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/--env.rb
View File

@ -21,10 +21,10 @@ module Homebrew extend self
def build_env_keys env def build_env_keys env
%w[ CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS %w[ CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH 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_DEBUG HOMEBREW_MAKE_JOBS HOMEBREW_VERBOSE HOMEBREW_USE_CLANG
HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT
HOMEBREW_SDKROOT HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE
MAKE GIT CPP MAKE GIT CPP
ACLOCAL_PATH OBJC PATH ].select{ |key| env.fetch(key) if env.key? key } ACLOCAL_PATH OBJC PATH ].select{ |key| env.fetch(key) if env.key? key }
end end

10
Library/Homebrew/superenv.rb
View File

@ -49,6 +49,7 @@ class << ENV
ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
ENV['PATH'] = determine_path ENV['PATH'] = determine_path
ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path
ENV['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir
ENV['HOMEBREW_CC'] = determine_cc ENV['HOMEBREW_CC'] = determine_cc
ENV['HOMEBREW_CCCFG'] = determine_cccfg ENV['HOMEBREW_CCCFG'] = determine_cccfg
ENV['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE ENV['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
@ -123,11 +124,12 @@ class << ENV
def determine_pkg_config_path def determine_pkg_config_path
paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/lib/pkgconfig" } paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/lib/pkgconfig" }
paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/pkgconfig" } paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/share/pkgconfig" }
paths << "#{HOMEBREW_PREFIX}/lib/pkgconfig" paths.to_path_s
paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" end
# we put our paths before X because we dupe some of the X libraries
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 << "#{MacSystem.x11_prefix}/lib/pkgconfig" << "#{MacSystem.x11_prefix}/share/pkgconfig" if x11?
paths << "#{HOMEBREW_REPOSITORY}/Library/ENV/pkgconfig/#{MacOS.version}"
paths.to_path_s paths.to_path_s
end end