aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/gdal.rb26
1 files changed, 24 insertions, 2 deletions
diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index dd65fa473..a234312c3 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -2,8 +2,8 @@ require 'formula'
class Gdal < Formula
homepage 'http://www.gdal.org/'
- url 'http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz'
- sha1 'e522b95056905e4c41047fdb42c0ca172ef3ad25'
+ url 'http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz'
+ sha1 'b4df76e2c0854625d2bedce70cc1eaf4205594ae'
head 'https://svn.osgeo.org/gdal/trunk/gdal'
@@ -181,6 +181,13 @@ class Gdal < Formula
return args
end
+ def patches
+ # Prevent build failure on 10.6 / 10.7
+ # TODO: Remove when 1.10.2 releases
+ # http://trac.osgeo.org/gdal/ticket/5197
+ DATA
+ end
+
def install
# Linking flags for SQLite are not added at a critical moment when the GDAL
# library is being assembled. This causes the build to fail due to missing
@@ -236,3 +243,18 @@ class Gdal < Formula
end
end
end
+
+__END__
+diff --git a/port/cpl_spawn.cpp b/port/cpl_spawn.cpp
+index d702594..69ea3c2 100644
+--- a/port/cpl_spawn.cpp
++++ b/port/cpl_spawn.cpp
+@@ -464,7 +464,7 @@ void CPLSpawnAsyncCloseErrorFileHandle(CPLSpawnedProcess* p)
+ #ifdef __APPLE__
+ #include <TargetConditionals.h>
+ #endif
+- #if defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
++ #if defined(__APPLE__) && (!defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE==0)
+ #include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
+ #else