Sort out remaining XQuartz/stdenv issues

We use PKG_CONFIG_LIBDIR to reset the default search path, overriding
whatever is baked into the pkg-config executable. This way, we can later
append XQuartz paths here while still allowing any brewed libs to take
precedence, keg-only or not.

Hopefully this will resolve any remaining issues, and let us get rid of
some per-formula hacks.

c.f. #14474.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

5 files changed, 19 insertions, 26 deletions

diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index e171712fa..da8acab3f 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -23,10 +23,6 @@ class Cairo < Formula
   def install
     ENV.universal_binary if build.universal?
 
-    pixman = Formula.factory('pixman')
-    ENV['pixman_CFLAGS'] = "-I#{pixman.include}/pixman-1"
-    ENV['pixman_LIBS'] = "-L#{pixman.lib} -lpixman-1"
-
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
diff --git a/Library/Formula/gtk+.rb b/Library/Formula/gtk+.rb
index 7ccfae524..2b6b65781 100644
--- a/Library/Formula/gtk+.rb
+++ b/Library/Formula/gtk+.rb
@@ -23,11 +23,6 @@ class Gtkx < Formula
   end
 
   def install
-    # Always prefer our cairo over XQuartz cairo
-    cairo = Formula.factory('cairo')
-    ENV['CAIRO_BACKEND_CFLAGS'] = "-I#{cairo.include}/cairo"
-    ENV['CAIRO_BACKEND_LIBS'] = "-L#{cairo.lib} -lcairo"
-
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/gtk+3.rb b/Library/Formula/gtk+3.rb
index a506222c3..7cab0ad05 100644
--- a/Library/Formula/gtk+3.rb
+++ b/Library/Formula/gtk+3.rb
@@ -18,11 +18,6 @@ class Gtkx3 < Formula
   depends_on 'atk' => :optional
 
   def install
-    # Always prefer our cairo over XQuartz cairo
-    cairo = Formula.factory('cairo')
-    ENV['CAIRO_BACKEND_CFLAGS'] = "-I#{cairo.include}/cairo"
-    ENV['CAIRO_BACKEND_LIBS'] = "-L#{cairo.lib} -lcairo"
-
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index 48b8a09ee..4edef0327 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -25,11 +25,6 @@ class Pango < Formula
   end
 
   def install
-    # Always prefer our cairo over XQuartz cairo
-    cairo = Formula.factory('cairo')
-    ENV['CAIRO_CFLAGS'] = "-I#{cairo.include}/cairo"
-    ENV['CAIRO_LIBS'] = "-L#{cairo.lib} -lcairo"
-
     args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index b1d7eab12..e8c0c0ad3 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -14,12 +14,12 @@ module HomebrewEnvExtension
       # it encounters files with mixed character sets
       delete('LC_ALL')
       self['LC_CTYPE']="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
 
+    # Set the default pkg-config search path, overriding the built-in paths
+    # Anything in PKG_CONFIG_PATH is searched before paths in this variable
+    self['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir
+
     # make any aclocal stuff installed in Homebrew available
     self['ACLOCAL_PATH'] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.provides_autotools?
 
@@ -66,6 +66,15 @@ module HomebrewEnvExtension
     end
   end
 
+  def determine_pkg_config_libdir
+    paths = []
+    paths << HOMEBREW_PREFIX/'lib/pkgconfig'
+    paths << HOMEBREW_PREFIX/'share/pkgconfig'
+    paths << HOMEBREW_REPOSITORY/'Library/Homebrew/pkgconfig' if MacOS.version >= :mountain_lion
+    paths << '/usr/lib/pkgconfig'
+    paths.select { |d| File.directory? d }.join(':')
+  end
+
   def deparallelize
     remove 'MAKEFLAGS', /-j\d+/
   end
@@ -249,10 +258,13 @@ module HomebrewEnvExtension
 
   def x11
     # There are some config scripts here that should go in the PATH
-    prepend 'PATH', MacOS::X11.bin, ':'
+    append 'PATH', MacOS::X11.bin, ':'
 
-    prepend 'PKG_CONFIG_PATH', MacOS::X11.lib/'pkgconfig', ':'
-    prepend 'PKG_CONFIG_PATH', MacOS::X11.share/'pkgconfig', ':'
+    # Append these to PKG_CONFIG_LIBDIR so they are searched
+    # *after* our own pkgconfig directories, as we dupe some of the
+    # libs in XQuartz.
+    append 'PKG_CONFIG_LIBDIR', MacOS::X11.lib/'pkgconfig', ':'
+    append 'PKG_CONFIG_LIBDIR', MacOS::X11.share/'pkgconfig', ':'
 
     append 'LDFLAGS', "-L#{MacOS::X11.lib}"
     append 'CMAKE_PREFIX_PATH', MacOS::X11.prefix, ':'