diff options
| author | Charlie Sharpsteen | 2011-05-18 09:38:12 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2011-05-19 08:01:22 -0700 |
| commit | 302ab10d8a6160f11fb0c6268acbe3e7996b59d7 (patch) | |
| tree | e3363a54f4d970f44501922a40a5fa77d56a30e7 /Library/Formula | |
| parent | fbb968543d78c0594cb13d2ff0410756bc11aa14 (diff) | |
| download | homebrew-302ab10d8a6160f11fb0c6268acbe3e7996b59d7.tar.bz2 | |
Cleanup Poppler formula
Consolidate `pkg-config` query into one command. Add Homebrew lib directory to
LDFLAGS so that Qt Frameworks can be found on 10.5.0 where
`libtool` strips the `-F` flag unless it is preceded by `-Wl`.
Move patch explanation into the patch.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/poppler.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index 0eb9081a2..3e2773c3d 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -26,9 +26,8 @@ class Poppler < Formula def install if ARGV.include? "--with-qt4" - qt4Flags = `pkg-config QtCore --libs` + `pkg-config QtGui --libs` - qt4Flags.gsub!("\n","") - ENV['POPPLER_QT4_CFLAGS'] = qt4Flags + ENV['POPPLER_QT4_CFLAGS'] = `pkg-config QtCore QtGui --libs`.chomp.strip + ENV.append 'LDFLAGS', "-Wl,-F#{HOMEBREW_PREFIX}/lib" end args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] @@ -45,8 +44,10 @@ class Poppler < Formula end end -# fix location of fontconfig, http://www.mail-archive.com/poppler@lists.freedesktop.org/msg03837.html __END__ +fix location of fontconfig: + http://www.mail-archive.com/poppler@lists.freedesktop.org/msg03837.html + --- a/cpp/Makefile.in 2010-07-08 20:57:56.000000000 +0200 +++ b/cpp/Makefile.in 2010-08-06 11:11:27.000000000 +0200 @@ -375,7 +375,8 @@ |