public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdal: fix the build

Browse Source 
Commit 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c added explicit CC and
CXX assignments in pkgs/build-support/gcc-wrapper/setup-hook.sh.
That breaks the gdal python extension build somehow, presumably by
confusing libtool.

This appears to revert gdal to building with g++ and gcc (on linux at
least), but at least it builds this way.

Change-Id: I83fb78daa9314dc60c4f635d3f1e937a90349b8a
This commit is contained in:
Benjamin Staffin 2015-01-13 23:46:26 -08:00
parent 0351b7a710
commit b3d33d398c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gdal/default.nix
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;
}; };
}) })