From 724d9cbf68c334054523401b54b929111eb66b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Fri, 15 Jul 2022 11:02:57 +0200
Subject: [PATCH] Fixup 8afb42 (Fix hxtorch)
Now we also modify the `SPACK_`-prefixed stuff for the spack compiler
wrappers.
---
packages/hxtorch/package.py | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index 1af5ac0f..c8b4dd48 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -59,11 +59,14 @@ class Hxtorch(WafPackage):
include = []
for dep in self.spec.traverse(deptype='build'):
- if dep.name == 'pthreadpool':
- print('skipping {} for headers'.format(dep.name))
- continue
query = self.spec[dep.name]
try:
+ if dep.name == 'pthreadpool':
+ print('skipping {} for headers'.format(dep.name))
+ for d in query.headers.directories:
+ if os.path.exists(d):
+ env.remove_path('SPACK_INCLUDE_DIRS', d)
+ continue
include.extend(query.headers.directories)
print('headers (', dep.name, '):', query.headers.directories, "\n")
except:
@@ -71,11 +74,15 @@ class Hxtorch(WafPackage):
library = []
for dep in self.spec.traverse(deptype=('link', 'run')):
- if dep.name == 'pthreadpool':
- print('skipping {} for libs'.format(dep.name))
- continue
query = self.spec[dep.name]
try:
+ if dep.name == 'pthreadpool':
+ print('skipping {} for libs'.format(dep.name))
+ for d in query.libs.directories:
+ if os.path.exists(d):
+ env.remove_path('SPACK_LINK_DIRS', d)
+ env.remove_path('SPACK_RPATH_DIRS', d)
+ continue
library.extend(query.libs.directories)
print('libs (', dep.name, '):', query.libs.directories, "\n")
except:
--
GitLab