patch to enable compilation of netcdf with later builds of GCC and OSX

This commit is contained in:
P.M. Sutter 2014-09-11 04:51:53 -05:00
parent 1ff47d928e
commit e8f1449741
2 changed files with 15 additions and 0 deletions

View file

@ -138,6 +138,11 @@ if (INTERNAL_NETCDF)
DEPENDS ${hdf5_built}
PREFIX ${BUILD_PREFIX}/netcdf-prefix
URL ${NETCDF_URL}
PATCH_COMMAND ${CMAKE_COMMAND}
-DBUILD_PREFIX=${BUILD_PREFIX}/netcdf-prefix
-DPATCH_FILE=${CMAKE_SOURCE_DIR}/external/patch_netcdf
-DSOURCE_PREFIX=${BUILD_PREFIX}/netcdf-prefix/src/netcdf/ncgen3
-P ${CMAKE_SOURCE_DIR}/external/check_and_apply_patch.cmake
CONFIGURE_COMMAND ${NETCDF_SOURCE_DIR}/configure
--prefix=${NETCDF_BIN_DIR} --libdir=${NETCDF_BIN_DIR}/lib
--enable-netcdf-4 --with-pic --disable-shared --disable-dap

10
external/patch_netcdf vendored Normal file
View file

@ -0,0 +1,10 @@
--- load.c 2011-06-30 18:22:19.000000000 -0500
+++ new_load.c 2014-09-11 04:47:52.057267514 -0500
@@ -5,6 +5,7 @@
*********************************************************************/
#include <stdio.h>
+#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>