diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/wrf/patches/4.2/arch.Config.pl.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/wrf/patches/4.2/arch.Config.pl.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/wrf/patches/4.2/arch.Config.pl.patch b/var/spack/repos/builtin/packages/wrf/patches/4.2/arch.Config.pl.patch new file mode 100644 index 0000000000..ca3840ac55 --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/patches/4.2/arch.Config.pl.patch @@ -0,0 +1,62 @@ +diff --git a/arch/Config.pl b/arch/Config.pl +index b6f45db..75fad32 100644 +--- a/arch/Config.pl ++++ b/arch/Config.pl +@@ -8,6 +8,7 @@ + select((select(STDOUT), $|=1)[0]); + $sw_perl_path = perl ; + $sw_netcdf_path = "" ; ++$sw_netcdff_path = "" ; + $sw_pnetcdf_path = "" ; + $sw_hdf5_path=""; + $sw_phdf5_path=""; +@@ -63,6 +64,10 @@ while ( substr( $ARGV[0], 0, 1 ) eq "-" ) + { + $sw_netcdf_path = substr( $ARGV[0], 8 ) ; + } ++ if ( substr( $ARGV[0], 1, 8 ) eq "netcdff=" ) ++ { ++ $sw_netcdff_path = substr( $ARGV[0], 9 ) ; ++ } + if ( substr( $ARGV[0], 1, 13 ) eq "dep_lib_path=" ) + { + $sw_dep_lib_path = substr( $ARGV[0], 14 ) ; +@@ -117,6 +122,7 @@ while ( substr( $ARGV[0], 0, 1 ) eq "-" ) + if ( substr( $ARGV[0], 1, 11 ) eq "USENETCDFF=" ) + { + $sw_usenetcdff = substr( $ARGV[0], 12 ) ; ++ $sw_usenetcdff =~ s/!/ /g ; + } + if ( substr( $ARGV[0], 1, 10 ) eq "USENETCDF=" ) + { +@@ -443,6 +449,7 @@ while ( <CONFIGURE_DEFAULTS> ) + { + $_ =~ s/CONFIGURE_PERL_PATH/$sw_perl_path/g ; + $_ =~ s/CONFIGURE_NETCDF_PATH/$sw_netcdf_path/g ; ++ $_ =~ s/CONFIGURE_NETCDFF_PATH/$sw_netcdff_path/g ; + $_ =~ s/CONFIGURE_PNETCDF_PATH/$sw_pnetcdf_path/g ; + $_ =~ s/CONFIGURE_HDF5_PATH/$sw_hdf5_path/g ; + $_ =~ s/CONFIGURE_PHDF5_PATH/$sw_phdf5_path/g ; +@@ -484,17 +491,19 @@ while ( <CONFIGURE_DEFAULTS> ) + if ( $sw_netcdf_path ) + { $_ =~ s/CONFIGURE_WRFIO_NF/wrfio_nf/g ; + $_ =~ s:CONFIGURE_NETCDF_FLAG:-DNETCDF: ; ++ $_ =~ s:CONFIGURE_NETCDFF_FLAG:-DNETCDFF: ; + if ( $ENV{NETCDF_LDFLAGS} ) { +- $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a $ENV{NETCDF_LDFLAGS} : ; ++ $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a $ENV{NETCDF_LDFLAGS} $ENV{NETCDFF_LDFLAGS}: ; + } elsif ( $sw_os eq "Interix" ) { +- $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; ++ $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib -L$sw_netcdff_path/lib $sw_usenetcdff $sw_usenetcdf : ; + } else { +- $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib $sw_usenetcdff $sw_usenetcdf : ; ++ $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib -L$sw_netcdff_path/lib $sw_usenetcdff $sw_usenetcdf : ; + } + } + else + { $_ =~ s/CONFIGURE_WRFIO_NF//g ; + $_ =~ s:CONFIGURE_NETCDF_FLAG::g ; ++ $_ =~ s:CONFIGURE_NETCDFF_FLAG::g ; + $_ =~ s:CONFIGURE_NETCDF_LIB_PATH::g ; + } + |