From b7da320f19c259aa7f594e2918bc9c99647fbba5 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Tue, 21 Jun 2022 11:21:30 +0530
Subject: [PATCH] Add Fortan support required by root and few other packages
---
containers/oneapi/onedev.Dockerfile | 11 ++++++-----
spack.yaml | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index c286adb37..a9241526d 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -8,7 +8,6 @@
## ========================================================================================
-
FROM intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04 AS oneapi
@@ -39,6 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
file \
build-essential \
gdb \
+ gfortran \
ghostscript \
git \
gnupg2 \
@@ -142,6 +142,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
&& spack mirror add docker /var/cache/spack-mirror \
&& spack mirror list
+## This variable will change whenevery either spack.yaml or our spack package
+## overrides change, triggering a rebuild
+ARG CACHE_BUST="hash"
+ARG CACHE_NUKE=""
+
## Setup our custom environment and package overrides
COPY spack $SPACK_ROOT/eic-spack
RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
@@ -152,10 +157,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
&& spack env activate . \
&& spack concretize
-## This variable will change whenevery either spack.yaml or our spack package
-## overrides change, triggering a rebuild
-ARG CACHE_BUST="hash"
-ARG CACHE_NUKE=""
## Now execute the main build (or fetch from cache if possible)
## note, no-check-signature is needed to allow the quicker signature-less
diff --git a/spack.yaml b/spack.yaml
index adfe9d37a..48650471b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -50,8 +50,8 @@ spack:
paths:
cc: /usr/bin/gcc
cxx: /usr/bin/g++
- f77:
- fc:
+ f77: /usr/bin/gfortran
+ fc: /usr/bin/gfortran
flags: {}
operating_system: ubuntu18.04
target: x86_64
--
GitLab