From 836db438b55a607e2d41cfca69c0e4bce38397a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Mon, 22 Jul 2024 17:16:00 +0200
Subject: [PATCH] feat: allow for spack-external (system) python
Change-Id: I605c9d202d89b845d216eac7bcaaef5227d3da75
---
bin/yashchiki | 3 ++-
share/yashchiki/styles/asic/config.yaml | 4 +++-
share/yashchiki/styles/f27/config.yaml | 4 +++-
share/yashchiki/styles/visionary/config.yaml | 4 +++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/bin/yashchiki b/bin/yashchiki
index 296ecc0c..8970d3f1 100755
--- a/bin/yashchiki
+++ b/bin/yashchiki
@@ -172,7 +172,8 @@ env.update({
# (2.7.18) will pollute the spec and lead to a conflict
# can be removed as soon as the explicit preferred version
# is dropped
- "DEPENDENCY_PYTHON": "python@" + config["dependency_python"],
+ "DEPENDENCY_BUILD_PYTHON": str(int(config["dependency_python"]["build"])),
+ "DEPENDENCY_PYTHON": "python@" + config["dependency_python"]["version"],
"YASHCHIKI_BUILD_SPACK_GCC": str(int(config["spack_gcc"]["build"])),
"YASHCHIKI_SPACK_GCC_VERSION": config["spack_gcc"]["version"],
"YASHCHIKI_SPACK_GCC": "gcc@" + config["spack_gcc"]["version"],
diff --git a/share/yashchiki/styles/asic/config.yaml b/share/yashchiki/styles/asic/config.yaml
index 357aadf8..bf0af488 100644
--- a/share/yashchiki/styles/asic/config.yaml
+++ b/share/yashchiki/styles/asic/config.yaml
@@ -1,6 +1,8 @@
docker_base_image: "rockylinux:8"
# ECM: it's 3.9.18 really, but that's not yet in the current spack; fix when ready
-dependency_python: "3.9.16"
+dependency_python:
+ build: false
+ version: "3.9.16"
spack_gcc:
build: false
version: "8.5.0"
diff --git a/share/yashchiki/styles/f27/config.yaml b/share/yashchiki/styles/f27/config.yaml
index 7b8f7f4c..21955bf4 100644
--- a/share/yashchiki/styles/f27/config.yaml
+++ b/share/yashchiki/styles/f27/config.yaml
@@ -1,5 +1,7 @@
docker_base_image: "debian:bullseye"
-dependency_python: "3.8.2"
+dependency_python:
+ build: true
+ version: "3.8.2"
spack_gcc:
# Whether to build the specified gcc via spack or assume existance.
build: true
diff --git a/share/yashchiki/styles/visionary/config.yaml b/share/yashchiki/styles/visionary/config.yaml
index 7b8f7f4c..21955bf4 100644
--- a/share/yashchiki/styles/visionary/config.yaml
+++ b/share/yashchiki/styles/visionary/config.yaml
@@ -1,5 +1,7 @@
docker_base_image: "debian:bullseye"
-dependency_python: "3.8.2"
+dependency_python:
+ build: true
+ version: "3.8.2"
spack_gcc:
# Whether to build the specified gcc via spack or assume existance.
build: true
--
GitLab