diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2021-07-31 22:11:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 21:11:34 -0500 |
| commit | 1e708bdb455b84eae36747a2d2f6eec2bb938c55 (patch) | |
| tree | d53c312bb64e5dad0849cf6032c86f2fb1e8aaea | |
| parent | 60eef9c0de7b2f822a0e647b67cfe1895aa1f2e1 (diff) | |
| download | spack-1e708bdb455b84eae36747a2d2f6eec2bb938c55.tar.gz spack-1e708bdb455b84eae36747a2d2f6eec2bb938c55.tar.bz2 spack-1e708bdb455b84eae36747a2d2f6eec2bb938c55.tar.xz spack-1e708bdb455b84eae36747a2d2f6eec2bb938c55.zip | |
lorene: Install only executables, not unrelated files (#25148)
* lorene: Install only executables, not unrelated files in the same directory
* lorene: Don't determine compile dependencies
The current way doesn't work (cpp misses C++ include paths), and we don't need dependencies anyway.
* lorene: Correct BLAS library names
* lorene: Remove comment
| -rw-r--r-- | var/spack/repos/builtin/packages/lorene/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/lorene/package.py b/var/spack/repos/builtin/packages/lorene/package.py index d8cef6630e..fc8a574815 100644 --- a/var/spack/repos/builtin/packages/lorene/package.py +++ b/var/spack/repos/builtin/packages/lorene/package.py @@ -39,7 +39,7 @@ class Lorene(MakefilePackage): parallel = False def edit(self, spec, prefix): - blas_libs = spec['lapack'].libs.link_flags + blas_libs = spec['blas'].libs.link_flags fftw_incdirs = "-I" + spec['fftw'].prefix.include if '+fftw' in spec else "" fftw_libdirs = "-L" + spec['fftw'].prefix.lib if '+fftw' in spec else "" fftw_libs = spec['fftw'].libs.link_flags @@ -63,7 +63,7 @@ class Lorene(MakefilePackage): "-I$(HOME_LORENE)/C++/Include_extra " + fftw_incdirs + " " + gsl_incdirs + " " + pgplot_incdirs)), ('@RANLIB@', "ls"), - ('@MAKEDEPEND@', "cpp $(INC) -M >> $(df).d $<"), + ('@MAKEDEPEND@', ": >$(df).d"), ('@FFT_DIR@', "FFTW3"), ('@LIB_CXX@', fftw_libdirs + " " + fftw_libs + " -lgfortran"), ('@LIB_GSL@', gsl_libdirs + " " + gsl_libs), @@ -99,7 +99,9 @@ class Lorene(MakefilePackage): install_tree('Lib', prefix.lib) mkdirp(prefix.bin) if '+bin_star' in spec: - install_tree(join_path('Codes', 'Bin_star'), prefix.bin) + for exe in ['coal', 'lit_bin', 'init_bin', 'coal_regu', + 'init_bin_regu', 'analyse', 'prepare_seq']: + install(join_path('Codes', 'Bin_star', exe), prefix.bin) @property def libs(self): |