From 1e708bdb455b84eae36747a2d2f6eec2bb938c55 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 31 Jul 2021 22:11:34 -0400 Subject: 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 --- var/spack/repos/builtin/packages/lorene/package.py | 8 +++++--- 1 file 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): -- cgit v1.2.3-70-g09d2