Skip to content
Snippets Groups Projects
Commit d9a1f32b authored by Athanasios Karmas's avatar Athanasios Karmas
Browse files

Merge branch 'fix_pynn-brainscales' into 'master'

Fix: pynn-brainscales build depends on py-pyyaml

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!70
parents c2aa0eec 42237ea2
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ class PynnBrainscales(WafPackage): ...@@ -14,6 +14,7 @@ class PynnBrainscales(WafPackage):
version('2.0-rc1', branch='waf') version('2.0-rc1', branch='waf')
depends_on('meta-brainscales', type=('build', 'link', 'run')) depends_on('meta-brainscales', type=('build', 'link', 'run'))
depends_on('py-pyyaml', type=('build'))
extends('python') extends('python')
def setup_build_environment(self, env): def setup_build_environment(self, env):
...@@ -26,6 +27,7 @@ class PynnBrainscales(WafPackage): ...@@ -26,6 +27,7 @@ class PynnBrainscales(WafPackage):
query = self.spec[dep.name] query = self.spec[dep.name]
try: try:
include.extend(query.headers.directories) include.extend(query.headers.directories)
print('headers:', query.headers.directories, "\n")
except: except:
pass pass
...@@ -34,7 +36,7 @@ class PynnBrainscales(WafPackage): ...@@ -34,7 +36,7 @@ class PynnBrainscales(WafPackage):
query = self.spec[dep.name] query = self.spec[dep.name]
try: try:
library.extend(query.libs.directories) library.extend(query.libs.directories)
print(query.libs.directories, "\n") print('libs:', query.libs.directories, "\n")
except: except:
pass pass
...@@ -43,6 +45,7 @@ class PynnBrainscales(WafPackage): ...@@ -43,6 +45,7 @@ class PynnBrainscales(WafPackage):
query = self.spec[dep.name] query = self.spec[dep.name]
try: try:
path.append(query.prefix.bin) path.append(query.prefix.bin)
print('bin:', query.prefix.bin, "\n")
except: except:
pass pass
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment