style: bring packages in compliance with pep8-naming
This commit is contained in:
@@ -229,7 +229,7 @@ def yes_no(varstr):
|
||||
# from within MFEM.
|
||||
|
||||
# Similar to spec[pkg].libs.ld_flags but prepends rpath flags too.
|
||||
def ld_flags_from_LibraryList(libs_list):
|
||||
def ld_flags_from_library_list(libs_list):
|
||||
flags = ['-Wl,-rpath,%s' % dir for dir in libs_list.directories]
|
||||
flags += [libs_list.ld_flags]
|
||||
return ' '.join(flags)
|
||||
@@ -298,7 +298,7 @@ def find_optional_library(name, prefix):
|
||||
hypre['blas'].libs
|
||||
options += [
|
||||
'HYPRE_OPT=-I%s' % hypre.prefix.include,
|
||||
'HYPRE_LIB=%s' % ld_flags_from_LibraryList(all_hypre_libs)]
|
||||
'HYPRE_LIB=%s' % ld_flags_from_library_list(all_hypre_libs)]
|
||||
|
||||
if '+metis' in spec:
|
||||
options += [
|
||||
@@ -310,7 +310,7 @@ def find_optional_library(name, prefix):
|
||||
lapack_blas = spec['lapack'].libs + spec['blas'].libs
|
||||
options += [
|
||||
# LAPACK_OPT is not used
|
||||
'LAPACK_LIB=%s' % ld_flags_from_LibraryList(lapack_blas)]
|
||||
'LAPACK_LIB=%s' % ld_flags_from_library_list(lapack_blas)]
|
||||
|
||||
if '+superlu-dist' in spec:
|
||||
lapack_blas = spec['lapack'].libs + spec['blas'].libs
|
||||
@@ -321,28 +321,28 @@ def find_optional_library(name, prefix):
|
||||
'SUPERLU_LIB=-L%s -L%s -lsuperlu_dist -lparmetis %s' %
|
||||
(spec['superlu-dist'].prefix.lib,
|
||||
spec['parmetis'].prefix.lib,
|
||||
ld_flags_from_LibraryList(lapack_blas))]
|
||||
ld_flags_from_library_list(lapack_blas))]
|
||||
|
||||
if '+suite-sparse' in spec:
|
||||
ss_spec = 'suite-sparse:' + self.suitesparse_components
|
||||
options += [
|
||||
'SUITESPARSE_OPT=-I%s' % spec[ss_spec].prefix.include,
|
||||
'SUITESPARSE_LIB=%s' %
|
||||
ld_flags_from_LibraryList(spec[ss_spec].libs)]
|
||||
ld_flags_from_library_list(spec[ss_spec].libs)]
|
||||
|
||||
if '+sundials' in spec:
|
||||
sun_spec = 'sundials:' + self.sundials_components
|
||||
options += [
|
||||
'SUNDIALS_OPT=%s' % spec[sun_spec].headers.cpp_flags,
|
||||
'SUNDIALS_LIB=%s' %
|
||||
ld_flags_from_LibraryList(spec[sun_spec].libs)]
|
||||
ld_flags_from_library_list(spec[sun_spec].libs)]
|
||||
|
||||
if '+petsc' in spec:
|
||||
# options += ['PETSC_DIR=%s' % spec['petsc'].prefix]
|
||||
options += [
|
||||
'PETSC_OPT=%s' % spec['petsc'].headers.cpp_flags,
|
||||
'PETSC_LIB=%s' %
|
||||
ld_flags_from_LibraryList(spec['petsc'].libs)]
|
||||
ld_flags_from_library_list(spec['petsc'].libs)]
|
||||
|
||||
if '+pumi' in spec:
|
||||
options += ['PUMI_DIR=%s' % spec['pumi'].prefix]
|
||||
@@ -360,7 +360,7 @@ def find_optional_library(name, prefix):
|
||||
options += [
|
||||
'ZLIB_OPT=-I%s' % spec['zlib'].prefix.include,
|
||||
'ZLIB_LIB=%s' %
|
||||
ld_flags_from_LibraryList(spec['zlib'].libs)]
|
||||
ld_flags_from_library_list(spec['zlib'].libs)]
|
||||
|
||||
if '+mpfr' in spec:
|
||||
options += [
|
||||
@@ -383,7 +383,7 @@ def find_optional_library(name, prefix):
|
||||
libs += LibraryList(find_system_libraries('libdl'))
|
||||
options += [
|
||||
'LIBUNWIND_OPT=%s' % headers.cpp_flags,
|
||||
'LIBUNWIND_LIB=%s' % ld_flags_from_LibraryList(libs)]
|
||||
'LIBUNWIND_LIB=%s' % ld_flags_from_library_list(libs)]
|
||||
|
||||
if '+openmp' in spec:
|
||||
options += ['OPENMP_OPT=%s' % self.compiler.openmp_flag]
|
||||
@@ -408,7 +408,7 @@ def find_optional_library(name, prefix):
|
||||
libs += hdf5.libs
|
||||
options += [
|
||||
'CONDUIT_OPT=%s' % headers.cpp_flags,
|
||||
'CONDUIT_LIB=%s' % ld_flags_from_LibraryList(libs)]
|
||||
'CONDUIT_LIB=%s' % ld_flags_from_library_list(libs)]
|
||||
|
||||
make('config', *options, parallel=False)
|
||||
make('info', parallel=False)
|
||||
|
Reference in New Issue
Block a user