From 50f3d415637329859dfca361dbea2e1f5ac6152e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 8 Aug 2018 23:15:23 +0000
Subject: gdal_1_11: 1.11.3 -> 1.11.5

fortify is disabled because it is incompatible with -O0 (set below).
---
 pkgs/development/libraries/gdal/gdal-1_11.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/libraries/gdal')

diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
index 7d0b70ec627..4d1cee5b916 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -3,12 +3,12 @@
 , libpng }:
 
 stdenv.mkDerivation rec {
-  version = "1.11.3";
   name = "gdal-${version}";
+  version = "1.11.5";
 
   src = fetchurl {
-    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d";
+    url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
+    sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ./python.patch
   ];
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "fortify" ];
 
   # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
   # Unset CC and CXX as they confuse libtool.
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
     export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
-- 
cgit 1.4.1