Update GNUmakefile and changelog

GEOS-ESM · Sep 10, 2024 · 6730615 · 6730615
1 parent 8cc4eb7
commit 6730615
Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,20 @@
 ### Removed
 ### Added
 
+## [7.26.0] - 2024-09-10
+
+### Updates
+
+- curl 8.9.1
+- NCO 5.2.7
+- CDO 2.4.2
+- jpeg 9f
+
+### Fixed
+
+- Fixed GNU Make so that we don't require downloading all non-git libraries even if you are only building a few. Rather, we now
+  download at the config step for each library
+
 ## [7.25.0] - 2024-07-11
 
 ### Updates

diff --git a/GNUmakefile b/GNUmakefile
@@ -167,6 +167,9 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
         COMMON_FLAG := -fcommon
         export ALLOW_ARGUMENT_MISMATCH ALLOW_INVALID_BOZ
      endif
+	  # CDO needs C++20 standard
+     CDO_STD := -std=c++20
+     export CDO_STD
   endif
 
 # Clang has issues with some libraries due to strict C99
@@ -184,8 +187,8 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
         export MMACOS_MIN
 
         # There is an issue with clang++ and cdo
-        CLANG_STDC17 := -std=c++17
-        export CLANG_STDC17
+        CDO_STD := -std=c++20
+        export CDO_STD
 
         # We might need to add -Wl,-ld_classic to LDFLAGS but only for certain versions of macOS/XCode
         # This command:
@@ -211,6 +214,10 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
      export NO_IMPLICIT_INT_ERROR
      NO_INT_CONVERSION_ERROR := -Wno-int-conversion
      export NO_INT_CONVERSION_ERROR
+
+	  # CDO needs C++20 standard
+     CDO_STD := -std=c++20
+     export CDO_STD
   endif
 
 # HDF4 plus ifx does not work with Fortran bindings
@@ -336,6 +343,8 @@ else
    LIB_HDF4 =
    # Also need to remove hdfeos if no hdf4
    SUBDIRS := $(filter-out hdfeos,$(SUBDIRS))
+	# and remove SDPToolkit
+   SUBDIRS := $(filter-out SDPToolkit,$(SUBDIRS))
 endif
 
 # Since we do not build the Fortran interface
@@ -444,7 +453,7 @@ verify:
 
 .NOTPARALLEL: baselibs-config
 
-prelim: echo-compilers baselibs-config versions download
+prelim: echo-compilers baselibs-config versions
 
 echo-compilers:
 	@mkdir -p $(prefix)/etc
@@ -782,7 +791,7 @@ cdo.config: cdo.download cdo/configure netcdf.install udunits2.install
                       --with-udunits2=$(prefix) \
                       --disable-grib --disable-openmp \
                       --disable-shared --enable-static \
-                      CXXFLAGS="$(CLANG_STDC17)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
+                      CXXFLAGS="$(CDO_STD)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
 	@touch $@
 
 nccmp.config: nccmp/configure netcdf.install

diff --git a/README.md b/README.md
@@ -22,13 +22,13 @@ NASA/GSFC.
 | [xgboost](https://github.com/dmlc/xgboost)                               | v1.6.0       |
 | [antlr2](https://www.antlr2.org/)                                        | 2.7.7        |
 | [GSL](https://www.gnu.org/software/gsl/)                                 | 2.7          |
-| [jpeg](http://www.ijg.org/)                                              | 9e           |
+| [jpeg](http://www.ijg.org/)                                              | 9f           |
 | [zlib](http://www.zlib.net/)                                             | 1.3.1        |
 | [szip](https://support.hdfgroup.org/doc_resource/SZIP/)                  | 2.1.1        |
-| [cURL](https://curl.haxx.se/)                                            | 8.8.0        |
+| [curl](https://curl.haxx.se/)                                            | 8.9.1        |
 | [UDUNITS2](https://github.com/GMAO-SI-Team/UDUNITS-2.git)                | 2.2.28       |
-| [NCO](http://nco.sourceforge.net/)                                       | 5.2.6        |
-| [CDO](https://code.mpimet.mpg.de/projects/cdo)                           | 2.3.0        |
+| [NCO](http://nco.sourceforge.net/)                                       | 5.2.7        |
+| [CDO](https://code.mpimet.mpg.de/projects/cdo)                           | 2.4.2        |
 | [nccmp](https://gitlab.com/remikz/nccmp)                                 | 1.9.1.0      |
 | [HDF-EOS2](https://wiki.earthdata.nasa.gov/display/DAS)                  | 3.0          |
 | [HDF-EOS5](https://wiki.earthdata.nasa.gov/display/DAS)                  | 2.0          |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.25.0
+7.26.0