From 07975aec8bf4bde8d4ad20a468e8fc6e55a347a7 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 11 Jan 2023 18:22:21 +0000
Subject: [PATCH] fix: back to x86_64 for all packages
---
containers/jug/dev.Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index e484a17e9..ffae11e3a 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -40,7 +40,7 @@ RUN git clone https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \
&& ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
/usr/sbin/spack-env \
&& export PATH=${PATH}:${SPACK_ROOT}/bin \
- && spack config --scope site add "packages:all:target:[x86_64_v3]" \
+ && spack config --scope site add "packages:all:require:arch=x86_64" \
&& spack config blame packages \
&& spack config --scope site add "config:suppress_gpg_warnings:true" \
&& spack config --scope site add "config:build_jobs:64" \
@@ -93,7 +93,7 @@ RUN git clone https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT} \
COPY spack.yaml /opt/spack-environment/
RUN rm -r /usr/local \
&& spack env activate /opt/spack-environment/ \
- && spack concretize
+ && spack concretize --fresh
## Now execute the main build (or fetch from cache if possible)
--
GitLab