From dd4f0bca430f67a8f114724f3445a8310b7215f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Tue, 18 Feb 2025 16:39:12 +0100
Subject: [PATCH] fix(BSS2): support new spack's
SPACK_STORE_{INCLUDE,LINK}_DIRS
---
packages/build-brainscales/package.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/packages/build-brainscales/package.py b/packages/build-brainscales/package.py
index d8349c67..11f51ec2 100644
--- a/packages/build-brainscales/package.py
+++ b/packages/build-brainscales/package.py
@@ -140,11 +140,19 @@ class BuildBrainscales(WafPackage):
# spack tries to find headers and libraries by itself (i.e. it's not
# relying on the compiler to find it); we explicitly expose the
# spack-provided env vars that contain include and library paths
- if 'SPACK_INCLUDE_DIRS' in my_env:
+ if 'SPACK_STORE_INCLUDE_DIRS' in my_env:
+ for dir in reversed(get_path(my_env, "SPACK_STORE_INCLUDE_DIRS")):
+ env.prepend_path("C_INCLUDE_PATH", dir)
+ env.prepend_path("CPLUS_INCLUDE_PATH", dir)
+ elif 'SPACK_INCLUDE_DIRS' in my_env:
for dir in reversed(get_path(my_env, "SPACK_INCLUDE_DIRS")):
env.prepend_path("C_INCLUDE_PATH", dir)
env.prepend_path("CPLUS_INCLUDE_PATH", dir)
- if 'SPACK_LINK_DIRS' in my_env:
+ if 'SPACK_STORE_LINK_DIRS' in my_env:
+ for dir in reversed(get_path(my_env, "SPACK_STORE_LINK_DIRS")):
+ env.prepend_path("LIBRARY_PATH", dir)
+ env.prepend_path("LD_LIBRARY_PATH", dir)
+ elif 'SPACK_LINK_DIRS' in my_env:
for dir in reversed(get_path(my_env, "SPACK_LINK_DIRS")):
env.prepend_path("LIBRARY_PATH", dir)
env.prepend_path("LD_LIBRARY_PATH", dir)
--
GitLab