Add hint for gfortran

sfegan · Mar 7, 2025 · fea1536 · fea1536
1 parent 705abd6
commit fea1536
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/native-build-and-test.yml b/.github/workflows/native-build-and-test.yml
@@ -72,7 +72,7 @@ jobs:
           libhdf5-dev hdf5-tools                                               \
           libboost-all-dev libcli11-dev libeigen3-dev libre2-dev liblz4-dev    \
           zlib1g-dev nlohmann-json3-dev                                        \
-          gfortran ${{ matrix.compiler[2] }} 
+          ${{ matrix.compiler[2] }} 
         curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxf - -C /
         curl -L https://github.com/llr-cta/Geant4Build/releases/download/${{matrix.os}}-${{matrix.geant}}-OFF/Geant4-${{matrix.os}}-${{matrix.geant}}-OFF.tbz2 | sudo tar -jxf - -C /
         curl -L https://github.com/llr-cta/Corsika8Build/releases/download/ubuntu-22.04/corsika8_installed.tgz | sudo tar -zxf - -C /

diff --git a/.github/workflows/singularity-build-and-deploy.yml b/.github/workflows/singularity-build-and-deploy.yml
@@ -56,7 +56,7 @@ jobs:
           libhdf5-dev hdf5-tools                                               \
           libboost-all-dev libcli11-dev libeigen3-dev libre2-dev liblz4-dev    \
           zlib1g-dev nlohmann-json3-dev                                        \
-          libseccomp-dev pkg-config libfuse3-dev gfortran
+          libseccomp-dev pkg-config libfuse3-dev
         sudo pip3 install --upgrade pip
         sudo pip3 install numpy
         curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxf - -C /

diff --git a/CMakeModules/FindCORSIKA8.cmake b/CMakeModules/FindCORSIKA8.cmake
@@ -25,7 +25,7 @@ find_library ( FMT_LIBRARY NAMES fmt HINTS ${CORSIKA8_DIR} )
 find_library ( YAML_CPP_LIBRARY NAMES yaml-cpp HINTS ${CORSIKA8_DIR} )
 find_library ( YAML_LIBRARY NAMES yaml HINTS ${CORSIKA8_DIR} )
 # find_library ( BZ2_LIBRARY NAMES -lbz2 HINTS ${CORSIKA8_DIR} )
-find_library ( GFORTRAN_LIBRARY NAMES gfortran HINTS ${CORSIKA8_DIR} /opt/local/lib/gcc13 )
+find_library ( GFORTRAN_LIBRARY NAMES gfortran HINTS ${CORSIKA8_DIR} /opt/local/lib/gcc13 /usr/lib/gcc/x86_64-linux-gnu/11 )
 
 set ( CORSIKA8_LIBRARIES 
         ${CORSIKA8_DATA_LIBRARY} 

diff --git a/singularity_build.def b/singularity_build.def
@@ -82,8 +82,7 @@ From: ubuntu:22.04
         hdf5-tools                                                 \
         libre2-dev                                                 \
         libboost-all-dev                                           \
-        libutf8proc2                                               \
-        gfortran
+        libutf8proc2
 
     apt-get -y autoremove
     apt-get -y clean