diff --git a/packages/genpybind/package.py b/packages/genpybind/package.py index a0a631beff14bf1a6eda836c47e88c8874eb7700..fdca20b64b4a7089ec080aca1da4d907dc7ac6a9 100644 --- a/packages/genpybind/package.py +++ b/packages/genpybind/package.py @@ -43,8 +43,8 @@ class Genpybind(WafPackage): version('ebrains', tag='ebrains_release-1-rc1', git='https://github.com/electronicvisions/genpybind') depends_on( - 'llvm+clang+python+visionary@5.0.0: libcxx=none', - type=('build', 'link', 'run')) + 'llvm+clang+python+visionary@5.0.0:', + type=('build', 'link')) depends_on('binutils', type='build') depends_on('python@2.7:', type=('build', 'run')) @@ -52,6 +52,9 @@ class Genpybind(WafPackage): patch('v0.2.1-python3.10.patch', when='@:0.2.1 ^python@3.10:') + # llvm-config needs to be found at build time of packages using genpybind + def setup_dependent_build_environment(self, env, dependent_spec): + env.prepend_path("PATH", self.spec["llvm"].prefix.bin) def configure_args(self): args = super(Genpybind, self).configure_args() diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py index 745d6c579c31281b65b2b336e7dd7ae65b870084..4e4652dc0476168af5e98c4a3697585ae8dd9a94 100644 --- a/packages/hxtorch/package.py +++ b/packages/hxtorch/package.py @@ -45,7 +45,7 @@ class Hxtorch(build_brainscales.BuildBrainscales): depends_on('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', type=('build', 'link', 'run', 'test')) depends_on('cereal', type=('build', 'link', 'run', 'test')) depends_on('cppcheck', type=('build', 'link', 'run')) - depends_on('genpybind@ebrains', type=('build', 'link', 'run')) + depends_on('genpybind@ebrains', type=('build', 'link')) depends_on('gflags', type=('build', 'link', 'run')) depends_on('googletest@1.11.0:+gmock', type=('build', 'link', 'run')) # variadic templates needed depends_on('inja', type=('build', 'link', 'run', 'test')) # template engine for PPU source jit generation diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py index d3c8027e2ff4b82dcd843b42d84083503a6595ef..9bbefd4dc38588c62376f58551232279d8c7d246 100644 --- a/packages/pynn-brainscales/package.py +++ b/packages/pynn-brainscales/package.py @@ -45,7 +45,7 @@ class PynnBrainscales(build_brainscales.BuildBrainscales): depends_on('boost@1.69.0: +graph+icu+mpi+numpy+coroutine+context+filesystem+python+serialization+system+thread+program_options cxxstd=17', type=('build', 'link', 'run', 'test')) depends_on('cereal', type=('build', 'link', 'run', 'test')) depends_on('cppcheck', type=('build', 'link', 'run')) - depends_on('genpybind@ebrains', type=('build', 'link', 'run')) + depends_on('genpybind@ebrains', type=('build', 'link')) depends_on('gflags', type=('build', 'link', 'run')) depends_on('googletest@1.11.0:+gmock', type=('build', 'link', 'run')) # variadic templates needed depends_on('inja', type=('build', 'link', 'run', 'test')) # template engine for PPU source jit generation