From cdbcfd425c27bddda27b0a021eef2c692ffcc534 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 16 Feb 2024 12:09:17 -0500
Subject: [PATCH] fedora: drop flang-devel for F40

flang-devel package got merged into flang package.
---
 fedora | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fedora b/fedora
index 7f499d6..a2e1866 100644
--- a/fedora
+++ b/fedora
@@ -5,9 +5,15 @@ ARG INTEL
 
 RUN ( dnf -y update || dnf -y update ) && \
     dnf -y install \
-      make cmake git gcc-c++ gcc-gfortran ccache vim-minimal clang llvm compiler-rt sudo clang-tools-extra ninja-build libomp-devel wget zstd hwloc-devel flang flang-devel hpx-devel && \
+      make cmake git gcc-c++ gcc-gfortran ccache vim-minimal clang llvm compiler-rt sudo clang-tools-extra ninja-build libomp-devel wget zstd hwloc-devel flang hpx-devel && \
     dnf clean all
 
+RUN source /etc/os-release && if [ "${VERSION_ID}" -lt 40 ]; then \
+    ( dnf -y update || dnf -y update ) && \
+    dnf -y install flang-devel && \
+    dnf clean all; \
+fi
+
 RUN if [ "${INTEL}" = "yes" ]; then \
   printf "[oneAPI]\nname=Intel oneAPI\nbaseurl=https://yum.repos.intel.com/oneapi\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" > /etc/yum.repos.d/intel-oneapi.repo && \
   dnf -y update && \