diff options
| author | Jack Nagel | 2012-09-03 21:28:20 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-03 22:39:38 -0500 |
| commit | 93a4c48e369920d18bfd8835c8b27e98bccf01f5 (patch) | |
| tree | 1ff2dba89145fa2ad724e535b9460690db8df5f1 /Library/Formula | |
| parent | fb93fb2b2eab75220901e0211300924d75aa27e7 (diff) | |
| download | homebrew-93a4c48e369920d18bfd8835c8b27e98bccf01f5.tar.bz2 | |
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>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/cairo.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/gtk+.rb | 5 | ||||
| -rw-r--r-- | Library/Formula/gtk+3.rb | 5 | ||||
| -rw-r--r-- | Library/Formula/pango.rb | 5 |
4 files changed, 0 insertions, 19 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} |