Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ebrains-spack-builds
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Klaus Noelp
ebrains-spack-builds
Commits
7a1f7294
Commit
7a1f7294
authored
1 year ago
by
Eric Müller
Browse files
Options
Downloads
Patches
Plain Diff
feat(neuron): Use default install path for Python libs
parent
f43c3537
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/neuron/install-python-prefix.patch
+13
-0
13 additions, 0 deletions
packages/neuron/install-python-prefix.patch
packages/neuron/package.py
+3
-16
3 additions, 16 deletions
packages/neuron/package.py
with
16 additions
and
16 deletions
packages/neuron/install-python-prefix.patch
0 → 100644
+
13
−
0
View file @
7a1f7294
diff --git i/cmake/BuildOptionDefaults.cmake w/cmake/BuildOptionDefaults.cmake
index cdf1b2892..b5c90d84a 100644
--- i/cmake/BuildOptionDefaults.cmake
+++ w/cmake/BuildOptionDefaults.cmake
@@ -32,7 +32,7 @@
else()
set(NRN_ENABLE_INTERNAL_READLINE_DEFAULT OFF)
endif()
# Some distributions may set the prefix. To avoid errors, unset it
-set(NRN_MODULE_INSTALL_OPTIONS_DEFAULT "--prefix= --home=${CMAKE_INSTALL_PREFIX}")
+set(NRN_MODULE_INSTALL_OPTIONS_DEFAULT "--prefix=${CMAKE_INSTALL_PREFIX}")
set(NRN_PYTHON_DYNAMIC_DEFAULT "")
set(NRN_MPI_DYNAMIC_DEFAULT "")
set(NRN_RX3D_OPT_LEVEL_DEFAULT "0")
This diff is collapsed.
Click to expand it.
packages/neuron/package.py
+
3
−
16
View file @
7a1f7294
...
...
@@ -53,8 +53,11 @@ class Neuron(CMakePackage):
depends_on
(
"
caliper
"
,
when
=
"
+caliper
"
)
depends_on
(
"
py-numpy
"
,
type
=
"
run
"
)
extends
(
'
python
'
,
when
=
'
+python
'
)
patch
(
"
patch-v782-git-cmake-avx512.patch
"
,
when
=
"
@7.8.2
"
)
patch
(
"
nrn_find_ncurses.patch
"
,
when
=
"
@8.2.2
"
)
patch
(
"
install-python-prefix.patch
"
,
when
=
"
@8:9+python
"
)
def
cmake_args
(
self
):
spec
=
self
.
spec
...
...
@@ -140,22 +143,6 @@ class Neuron(CMakePackage):
corenrn_makefile
=
join_path
(
self
.
prefix
,
"
share/coreneuron/nrnivmodl_core_makefile
"
)
filter_file
(
env
[
"
CXX
"
],
cxx_compiler
,
corenrn_makefile
,
**
kwargs
)
def
setup_run_environment
(
self
,
env
):
env
.
prepend_path
(
"
PATH
"
,
join_path
(
self
.
prefix
,
"
bin
"
))
env
.
prepend_path
(
"
LD_LIBRARY_PATH
"
,
join_path
(
self
.
prefix
,
"
lib
"
))
if
self
.
spec
.
satisfies
(
"
+python
"
):
env
.
prepend_path
(
"
PYTHONPATH
"
,
self
.
spec
.
prefix
.
lib
.
python
)
# override setup_{build/run}_environment for standalone package tests
def
setup_build_environment
(
self
,
env
):
self
.
setup_run_environment
(
env
)
def
setup_dependent_build_environment
(
self
,
env
,
dependent_spec
):
self
.
setup_run_environment
(
env
)
def
setup_dependent_run_environment
(
self
,
env
,
dependent_spec
):
self
.
setup_run_environment
(
env
)
@run_after
(
'
install
'
)
@on_package_attributes
(
run_tests
=
True
)
def
install_test
(
self
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment