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

fix usage of self.build_directory in espressopp and astyle (#3053)

Browse Source
This commit is contained in:
Denis Davydov 2017-02-08 03:22:52 +01:00 committed by Todd Gamblin
parent b1f5b5f75b
commit 4264051954
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/astyle/package.py
View File

@ -44,7 +44,7 @@ def build_directory(self):
return join_path(self.stage.source_path, 'build', self.compiler.name) return join_path(self.stage.source_path, 'build', self.compiler.name)
def edit(self, spec, prefix): def edit(self, spec, prefix):
makefile = join_path(self.build_directory(), 'Makefile') makefile = join_path(self.build_directory, 'Makefile')
filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile) filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile)
# strangely enough install -o $(USER) -g $(USER) stoped working on OSX # strangely enough install -o $(USER) -g $(USER) stoped working on OSX
if sys.platform == 'darwin': if sys.platform == 'darwin':

2
var/spack/repos/builtin/packages/espressopp/package.py
View File

@ -72,7 +72,7 @@ def cmake_args(self):
return ['-DEXTERNAL_MPI4PY=ON', '-DEXTERNAL_BOOST=ON'] return ['-DEXTERNAL_MPI4PY=ON', '-DEXTERNAL_BOOST=ON']
def build(self, spec, prefix): def build(self, spec, prefix):
with working_dir(self.build_directory()): with working_dir(self.build_directory):
make() make()
if '+ug' in spec: if '+ug' in spec:
make("ug", parallel=False) make("ug", parallel=False)