Merge pull request #5761 from benley/fix-gdal

gdal: fix the build
This commit is contained in:
Peter Simons 2015-01-14 09:30:35 +01:00
commit 0f31f8a9f3

View file

@ -10,14 +10,15 @@ composableDerivation.composableDerivation {} (fixed: rec {
sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
}; };
buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj]; buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ];
# don't use optimization for gcc >= 4.3. That's said to be causeing segfaults # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; # Unset CC and CXX as they confuse libtool.
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg}" "--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support "--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"
@ -33,6 +34,5 @@ composableDerivation.composableDerivation {} (fixed: rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
broken = true;
}; };
}) })