From 1c912ca06afbc8d89b957c27ffc35f910101afba Mon Sep 17 00:00:00 2001 From: Fedor Bezrukov Date: Tue, 30 Apr 2013 20:35:53 -0400 Subject: [PATCH] gdal: Remove libdap patch This patch is no longer needed for GDAL 1.10. Closes #19550. Signed-off-by: Charlie Sharpsteen --- Library/Formula/gdal.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb index 2194c2687ccb..925706ea8d9d 100644 --- a/Library/Formula/gdal.rb +++ b/Library/Formula/gdal.rb @@ -46,8 +46,6 @@ class Gdal < Formula depends_on "cfitsio" depends_on "epsilon" depends_on "libdap" - # Fix a bug in LibDAP detection: http://trac.osgeo.org/gdal/ticket/4630 - def patches; DATA; end unless build.head? # Vector libraries depends_on "unixodbc" # OS X version is not complete enough @@ -256,19 +254,3 @@ def caveats end __END__ -Fix test for LibDAP >= 3.10. - - -diff --git a/configure b/configure -index 997bbbf..a1928d5 100755 ---- a/configure -+++ b/configure -@@ -24197,7 +24197,7 @@ else - rm -f islibdappost310.* - echo '#include "Connect.h"' > islibdappost310.cpp - echo 'int main(int argc, char** argv) { return 0; } ' >> islibdappost310.cpp --if test -z "`${CXX} islibdappost310.cpp -c ${DODS_INC} 2>&1`" ; then -+if test -z "`${CXX} islibdappost310.cpp -c ${DODS_INC} ${CPPFLAGS} 2>&1`" ; then - DODS_INC="$DODS_INC -DLIBDAP_310 -DLIBDAP_39" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libdap >= 3.10" >&5 - $as_echo "libdap >= 3.10" >&6; }