aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorLarry Shaffer2014-05-07 11:05:48 -0600
committerJack Nagel2014-05-13 17:18:39 -0500
commitf80a317ae0bf5241b4ed23e8f5bc17048b607448 (patch)
tree8fa77c6db0ca3565e6b23f1e6dbfff66583a5834 /Library/Formula
parent2d5e5f1ecc6e63287946876f2d4ff96ac7ed2b46 (diff)
downloadhomebrew-f80a317ae0bf5241b4ed23e8f5bc17048b607448.tar.bz2
gdal: don't link extra dylibs for vendored libkml
Closes #29041. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/gdal.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index d068b0c27..99a576858 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -75,7 +75,7 @@ class Gdal < Formula
# including prefix lib dir added by Homebrew:
# ld: warning: directory not found for option '-L/usr/local/Cellar/gdal/1.11.0/lib'
patch do
- url "https://gist.githubusercontent.com/dakcarto/7abad108aa31a1e53fb4/raw/gdal-armadillo.patch"
+ url "https://gist.githubusercontent.com/dakcarto/7abad108aa31a1e53fb4/raw/b56887208fd91d0434d5a901dae3806fb1bd32f8/gdal-armadillo.patch"
sha1 "3af1cae94a977d55541adba0d86c697d77bd1320"
end if build.include? "enable-armadillo"
@@ -266,6 +266,9 @@ class Gdal < Formula
# Fix hardcoded mandir: http://trac.osgeo.org/gdal/ticket/5092
inreplace 'configure', %r[^mandir='\$\{prefix\}/man'$], ''
+ # These libs are statically linked in vendored libkml and libkml formula
+ inreplace "configure", " -lminizip -luriparser", "" if build.with? "libkml"
+
system "./configure", *get_configure_args
system "make"
system "make install"