Install diffutils and patch packages in fedora and rockylinux

DusanJovic-NOAA · May 14, 2024 · 5ceb06a · 5ceb06a
1 parent a0ecc3b
commit 5ceb06a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora
@@ -6,6 +6,7 @@ RUN dnf clean all
 RUN dnf -y install \
            bison \
            cmake \
+           diffutils \
            flex \
            g++ \
            gfortran \
@@ -16,6 +17,7 @@ RUN dnf -y install \
            m4 \
            make \
            openmpi-devel \
+           patch \
            which
 
 ENV PATH=/usr/lib64/openmpi/bin:$PATH

diff --git a/docker/Dockerfile.rockylinux b/docker/Dockerfile.rockylinux
@@ -6,6 +6,7 @@ RUN dnf clean all
 RUN dnf -y install \
            bison \
            cmake \
+           diffutils \
            flex \
            g++ \
            gfortran \
@@ -16,6 +17,7 @@ RUN dnf -y install \
            m4 \
            make \
            openmpi-devel \
+           patch \
            which
 
 ENV PATH=/usr/lib64/openmpi/bin:$PATH

diff --git a/libs/ufslibs/CMakeLists.txt b/libs/ufslibs/CMakeLists.txt
@@ -14,13 +14,6 @@ find_package(MPI REQUIRED C CXX Fortran)
 
 set(install_prefix ${CMAKE_INSTALL_PREFIX})
 
-# if(${CMAKE_Fortran_COMPILER_ID} MATCHES "^(GNU)$")
-#   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
-#     set(FCFLAGS_fms "${FCFLAGS_fms} -fallow-argument-mismatch -fallow-invalid-boz")
-#     set(FCFLAGS_esmf "${FCFLAGS_esmf} -fallow-argument-mismatch -fallow-invalid-boz")
-#   endif()
-# endif()
-
 ##
 ## zstd
 ##
@@ -121,6 +114,7 @@ ExternalProject_Add(hdf5
                -DHDF5_ENABLE_PARALLEL=ON
                -DHDF5_ENABLE_Z_LIB_SUPPORT=ON
                -DHDF5_ENABLE_ZSTD_SUPPORT=ON
+               -DZLIB_ROOT=${install_prefix}/zlib
                -Dzstd_ROOT=${install_prefix}/zstd/lib/cmake
                -DHDF5_INSTALL_CMAKE_DIR=lib/cmake
     LOG_DOWNLOAD ON
@@ -220,8 +214,6 @@ ExternalProject_Add(fms
     BUILD_IN_SOURCE OFF
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/fms
                -DCMAKE_PREFIX_PATH=${install_prefix}/netcdf
-               -DCMAKE_C_FLAGS=${CFLAGS_fms}
-               -DCMAKE_Fortran_FLAGS=${FCFLAGS_fms}
                -DGFS_PHYS=ON
                -DCONSTANTS=GFS
                -D64BIT=ON