Skip to content

Commit a9267f6

Browse files
committed
Prevent apt-get from installing cmake, remove cmake from list of external packages for spack to find, remove not-buildable option from spack external find (might bring it back)
1 parent 28308f3 commit a9267f6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG HOST_CONFIG=docker-$SPEC
3131
ENV DEBIAN_FRONTEND=noninteractive
3232
RUN apt-get update -y
3333
RUN apt-get upgrade -y
34-
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
34+
RUN apt-get install -y build-essential git gfortran mpich autotools-dev autoconf sqlite pkg-config uuid gettext libncurses-dev libgdbm-dev libffi-dev libssl-dev libexpat-dev libreadline-dev libbz2-dev locales python python3 unzip libtool wget curl tk-dev
3535
RUN apt-get install -y python3-dev python3-venv python3-pip
3636
RUN apt-get install -y iputils-ping
3737

scripts/devtools/tpl-manager.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,17 @@ def custom_spack_env(self, env_dir, env_name):
149149

150150
# Find external packages and compilers
151151
# List of packages to find externally
152-
ext_packages = ["cmake", "git", "python"]
152+
ext_packages = ["git", "pkg-config", "autoconf", "automake"]
153153
if (not spack.spec.Spec(self.args.spec).satisfies("~mpi")):
154154
ext_packages.append("mpich")
155155
comp_cmd("find") # spack compiler find
156-
ext_cmd("find", "--not-buildable") # spack external find --not-buildable
157156
# Ignore any packages that are already found
158157
cur_packages = spack.config.get("packages")
159158
for i in ext_packages:
160159
if (i in cur_packages):
161160
ext_packages.remove(i)
162-
for i in ext_packages:
163-
ext_cmd("find", "--not-buildable", i)
161+
ext_cmd("find", *ext_packages)
162+
cur_packages = spack.config.get("packages")
164163
# TODO: Add logic to inform user when packages arent found
165164
# to encourage them to potentially add their own paths
166165
# Always add the spec for a custom environment

0 commit comments

Comments
 (0)