Skip to content

Commit

Permalink
gdal: revision bump, mojave fix
Browse files Browse the repository at this point in the history
Closes #68049.
  • Loading branch information
carlocab committed Dec 31, 2020
1 parent 87894b6 commit c0abdb5
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions Formula/gdal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Gdal < Formula
url "https://download.osgeo.org/gdal/3.2.0/gdal-3.2.0.tar.xz"
sha256 "b051f852600ffdf07e337a7f15673da23f9201a9dbb482bd513756a3e5a196a6"
license "MIT"
revision 1
revision 2

livecheck do
url "https://download.osgeo.org/gdal/CURRENT/"
Expand All @@ -26,6 +26,9 @@ class Gdal < Formula
depends_on "pkg-config" => :build

depends_on "cfitsio"
# Work around "Symbol not found: _curl_mime_addpart"
# due to mismatched SDK version in Mojave.
depends_on "curl" if MacOS.version == :mojave
depends_on "epsilon"
depends_on "expat"
depends_on "freexl"
Expand Down Expand Up @@ -78,7 +81,6 @@ def install
"--with-pcraster=internal",

# Homebrew backends
"--with-curl=/usr/bin/curl-config",
"--with-expat=#{Formula["expat"].prefix}",
"--with-freexl=#{Formula["freexl"].opt_prefix}",
"--with-geos=#{Formula["geos"].opt_prefix}/bin/geos-config",
Expand Down Expand Up @@ -139,11 +141,12 @@ def install
"--without-sosi",
]

# Work around "error: no member named 'signbit' in the global namespace"
# Remove once support for macOS 10.12 Sierra is dropped
if DevelopmentTools.clang_build_version >= 900
ENV.delete "SDKROOT"
ENV.delete "HOMEBREW_SDKROOT"
# Work around "Symbol not found: _curl_mime_addpart"
# due to mismatched SDK version in Mojave.
args << if MacOS.version == :mojave
"--with-curl=#{Formula["curl"].opt_prefix}/bin/curl-config"
else
"--with-curl=/usr/bin/curl-config"
end

system "./configure", *args
Expand Down

0 comments on commit c0abdb5

Please sign in to comment.