From 250a0350d0a4f99c191bb5d68a526045427f52ba Mon Sep 17 00:00:00 2001 From: Landon Owen Date: Tue, 14 May 2024 15:17:05 -0700 Subject: [PATCH] Removed external netlib-lapack from ubuntu package config file --- Dockerfile | 2 +- scripts/spack/configs/ubuntu20.04/packages.yaml | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed9b467ea..41a840fac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ ARG HOST_CONFIG=docker-$SPEC ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y RUN apt-get upgrade -y -RUN apt-get install -y build-essential git gfortran mpich autotools-dev autoconf sqlite pkg-config uuid gettext cmake libncurses-dev libgdbm-dev libffi-dev libssl-dev libexpat-dev libreadline-dev liblapack-dev libbz2-dev locales python python3 unzip libtool wget curl tk-dev +RUN apt-get install -y build-essential git gfortran mpich autotools-dev autoconf sqlite pkg-config uuid gettext cmake libncurses-dev libgdbm-dev libffi-dev libssl-dev libexpat-dev libreadline-dev libbz2-dev locales python python3 unzip libtool wget curl tk-dev # Setup system locale for pip package encoding/decoding RUN locale-gen en_US.UTF-8 diff --git a/scripts/spack/configs/ubuntu20.04/packages.yaml b/scripts/spack/configs/ubuntu20.04/packages.yaml index 77bcb9c6c..2795af05b 100644 --- a/scripts/spack/configs/ubuntu20.04/packages.yaml +++ b/scripts/spack/configs/ubuntu20.04/packages.yaml @@ -10,6 +10,8 @@ packages: mpi: [mpich] blas: [netlib-lapack] lapack: [netlib-lapack] + pkgconfig: [pkg-config] + pkgconf: [pkg-config] # ------ SYSTEM LIBS ------- ncurses: externals: @@ -116,8 +118,3 @@ packages: - spec: fontconfig@2.13.1 prefix: /usr buildable: false - netlib-lapack: - externals: - - spec: netlib-lapack@3.9.0 - prefix: /usr - buildable: false