Browse Source

fix proj in cdo

Super Pierre-Yves Barriat 4 năm trước cách đây
mục cha
commit
fe01ebea8c

+ 2 - 1
foss-2019b/CDO-1.9.8-gompi-2019b.eb

@@ -18,9 +18,10 @@ dependencies = [
     ('netCDF', '4.7.1'),
     ('YAXT', '0.6.2'),
     ('ecCodes', '2.15.0'),
+    ('PROJ', '6.2.1'),
 ]
 
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES"
+configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES --with-proj=$EBROOTPROJ"
 
 # fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
 prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "

+ 2 - 1
foss-2019b/ELIC_R-1-foss-2019b-R-3.6.2.eb

@@ -125,7 +125,8 @@ postinstallcmds = [
     "cd %(installdir)s && " +
     'Rscript -e "install.packages(c(\'treemap\', \'ggmap\', \'hts\', \'thief\', \'forecastHybrid\', \'ggseas\', \'colourpicker\', \'bsplus\', \'profvis\'), repos=\'https://www.freestatistics.org/cran/\', lib=\'%(installdir)s\')" && ' +
     'Rscript -e "library(remotes); install_github(\'myllym/GET\', lib=\'%(installdir)s\')" && ' +
-    'Rscript -e "install.packages(c(\'shinyFiles\', \'shinyjs\', \'shinyhelper\', \'shinycssloaders\', \'shinyWidgets\', \'shinyBS\'), repos=\'http://cran.rstudio.com/\', lib=\'%(installdir)s\')"'
+    'Rscript -e "install.packages(c(\'shinyFiles\', \'shinyjs\', \'shinyhelper\', \'shinycssloaders\', \'shinyWidgets\', \'shinyBS\'), repos=\'http://cran.rstudio.com/\', lib=\'%(installdir)s\')" && ' +
+    'Rscript -e "install.packages(c(\'jsonlite\', \'readxl\', \'tidyverse\', \'data.table\', \'lubridate\', \'stringdist\', \'stringi\', \'aws.s3\', \'snakecase\', \'fuzzyjoin\', \'Matrix\', \'RSelenium\'), repos=\'https://www.freestatistics.org/cran/\', lib=\'%(installdir)s\')"'
 ]
 
 sanity_check_paths = {