zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lorene: Install only executables, not unrelated files (#25148)

Browse Source 
* 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
This commit is contained in:
Erik Schnetter
2021-07-31 22:11:34 -04:00
committed by GitHub
parent 60eef9c0de
commit 1e708bdb45
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/lorene/package.py
View File

@@ -39,7 +39,7 @@ class Lorene(MakefilePackage):
parallel = False parallel = False
def edit(self, spec, prefix): 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_incdirs = "-I" + spec['fftw'].prefix.include if '+fftw' in spec else ""
fftw_libdirs = "-L" + spec['fftw'].prefix.lib if '+fftw' in spec else "" fftw_libdirs = "-L" + spec['fftw'].prefix.lib if '+fftw' in spec else ""
fftw_libs = spec['fftw'].libs.link_flags fftw_libs = spec['fftw'].libs.link_flags
@@ -63,7 +63,7 @@ def edit(self, spec, prefix):
"-I$(HOME_LORENE)/C++/Include_extra " + "-I$(HOME_LORENE)/C++/Include_extra " +
fftw_incdirs + " " + gsl_incdirs + " " + pgplot_incdirs)), fftw_incdirs + " " + gsl_incdirs + " " + pgplot_incdirs)),
('@RANLIB@', "ls"), ('@RANLIB@', "ls"),
('@MAKEDEPEND@', "cpp $(INC) -M >> $(df).d $<"), ('@MAKEDEPEND@', ": >$(df).d"),
('@FFT_DIR@', "FFTW3"), ('@FFT_DIR@', "FFTW3"),
('@LIB_CXX@', fftw_libdirs + " " + fftw_libs + " -lgfortran"), ('@LIB_CXX@', fftw_libdirs + " " + fftw_libs + " -lgfortran"),
('@LIB_GSL@', gsl_libdirs + " " + gsl_libs), ('@LIB_GSL@', gsl_libdirs + " " + gsl_libs),
@@ -99,7 +99,9 @@ def install(self, spec, prefix):
install_tree('Lib', prefix.lib) install_tree('Lib', prefix.lib)
mkdirp(prefix.bin) mkdirp(prefix.bin)
if '+bin_star' in spec: 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 @property
def libs(self): def libs(self):