aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMisty De Meo2011-12-09 09:33:47 -0600
committerJack Nagel2011-12-09 13:04:03 -0600
commit7c5b041b89499dafe521b8229b7aa2ef94c76088 (patch)
tree4bf010db402648af6d40d8f40b2d7429ff9c47ae /Library
parentb97c782a2882eb3be213864e406e8ddc5569e9ff (diff)
downloadhomebrew-7c5b041b89499dafe521b8229b7aa2ef94c76088.tar.bz2
glib: find libffi without pkg-config
glib's dependency on pkg-config can be eliminated if a few environment variables are set. This needed to be updated for libffi in order to build correctly. Fixes #9045. Closes #9064. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/glib.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index a16b168cc..499cbb328 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -56,10 +56,16 @@ class Glib < Formula
system "autoconf"
end
- # hack so that we don't have to depend on pkg-config
- # http://permalink.gmane.org/gmane.comp.package-management.pkg-config/627
+ # glib and pkg-config <= 0.26 have circular dependencies, so we should build glib without pkg-config
+ # The pkg-config dependency can be eliminated if certain env variables are set
+ # Note that this *may* need to be updated if any new dependencies are added in the future
+ # See http://permalink.gmane.org/gmane.comp.package-management.pkg-config/627
ENV['ZLIB_CFLAGS'] = ''
ENV['ZLIB_LIBZ'] = '-l'
+ # libffi include paths are dramatically ugly
+ libffi = Formula.factory('libffi')
+ ENV['LIBFFI_CFLAGS'] = "-I #{libffi.lib}/libffi-#{libffi.version}/include"
+ ENV['LIBFFI_LIBS'] = '-lffi'
system "./configure", *args