Merge pull request #728 from hashdist/netcdf

netcdf: Rebase the patch on top of the latest code

Author: certik

pkgs/netcdf4/max_dims.patch

@@ -1,24 +1,24 @@
-commit c3e8003955febdb8e46c760d21fe891f958dd245
+commit 9e8b68aae32f9fda89625a7a9c9cc391feb455e3
 Author: Ondřej Čertík <ondrej.certik@gmail.com>
-Date:   Sun Dec 7 23:11:01 2014 -0700
+Date:   Wed Apr 15 12:44:47 2015 -0600
 
     Increase max dimensions
-
+    
     In order to handle larger meshes in libraries like ExodusII and Moab.
 
 diff --git a/include/netcdf.h b/include/netcdf.h
-index 5d556bc..a642b71 100644
+index c9ca0af..ac27c2d 100644
 --- a/include/netcdf.h
 +++ b/include/netcdf.h
-@@ -225,9 +225,9 @@ created with the ::NC_CLASSIC_MODEL flag.
+@@ -226,9 +226,9 @@ created with the ::NC_CLASSIC_MODEL flag.
  As a rule, NC_MAX_VAR_DIMS <= NC_MAX_DIMS.
  */
  /**@{*/
--#define NC_MAX_DIMS	1024	
+-#define NC_MAX_DIMS	1024
 +#define NC_MAX_DIMS	65536
- #define NC_MAX_ATTRS	8192	
--#define NC_MAX_VARS	8192	
+ #define NC_MAX_ATTRS	8192
+-#define NC_MAX_VARS	8192
 +#define NC_MAX_VARS	524288
- #define NC_MAX_NAME	256	
+ #define NC_MAX_NAME	256
  #define NC_MAX_VAR_DIMS	1024 /**< max per variable dimensions */
  /**@}*/

pkgs/netcdf4/netcdf4.yaml

@@ -29,6 +29,6 @@ build_stages:
   files: [max_dims.patch]
   name: max_dims
   handler: bash
-  before: make
+  before: configure
   bash: |
     patch -p1 < _hashdist/max_dims.patch