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

mysql: Use correct python command (#13393)

Browse Source 
* mysql: Use correct python command

python~pythoncmd does not provide a python symlink for python3, so make
sure we pick the right command.

* mysql: Adapt to build env changes
This commit is contained in:
Michael Kuhn
2019-10-23 21:15:30 +02:00
committed by Adam J. Stewart
parent b7536eb332
commit 420346b275
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/mysql/package.py
View File

@@ -122,7 +122,7 @@ def cmake_args(self):
options.append('-DWITHOUT_SERVER:BOOL=ON') options.append('-DWITHOUT_SERVER:BOOL=ON')
return options return options
def _fix_dtrace_shebang(self, spack_env): def _fix_dtrace_shebang(self, build_env):
# dtrace may cause build to fail because it uses # dtrace may cause build to fail because it uses
# '/usr/bin/python' in the shebang. To work around that we copy # '/usr/bin/python' in the shebang. To work around that we copy
# the original script into a temporary folder, and change the # the original script into a temporary folder, and change the
@@ -135,27 +135,28 @@ def _fix_dtrace_shebang(self, spack_env):
copy(dtrace, dtrace_copy) copy(dtrace, dtrace_copy)
filter_file( filter_file(
'^#!/usr/bin/python', '^#!/usr/bin/python',
'#!/usr/bin/env python', '#!/usr/bin/env {0}'.format(
os.path.basename(self.spec['python'].command)),
dtrace_copy dtrace_copy
) )
# To have our own copy of dtrace in PATH, we need to # To have our own copy of dtrace in PATH, we need to
# prepend to PATH the temporary folder where it resides. # prepend to PATH the temporary folder where it resides.
spack_env.prepend_path('PATH', dtrace_copy_path) build_env.prepend_path('PATH', dtrace_copy_path)
@run_before('cmake') @run_before('cmake')
def _maybe_fix_dtrace_shebang(self): def _maybe_fix_dtrace_shebang(self):
if 'python' in self.spec.flat_dependencies() and \ if 'python' in self.spec.flat_dependencies() and \
self.spec.satisfies('@:7.99.99'): self.spec.satisfies('@:7.99.99'):
self._fix_dtrace_shebang(spack_env) self._fix_dtrace_shebang(build_env)
def setup_environment(self, spack_env, run_env): def setup_build_environment(self, env):
cxxstd = self.spec.variants['cxxstd'].value cxxstd = self.spec.variants['cxxstd'].value
flag = getattr(self.compiler, 'cxx{0}_flag'.format(cxxstd)) flag = getattr(self.compiler, 'cxx{0}_flag'.format(cxxstd))
if flag: if flag:
spack_env.append_flags('CXXFLAGS', flag) env.append_flags('CXXFLAGS', flag)
if cxxstd != '98': if cxxstd != '98':
if int(cxxstd) > 11: if int(cxxstd) > 11:
spack_env.append_flags('CXXFLAGS', env.append_flags('CXXFLAGS',
'-Wno-deprecated-declarations') '-Wno-deprecated-declarations')
if int(cxxstd) > 14: if int(cxxstd) > 14:
spack_env.append_flags('CXXFLAGS', '-Wno-error=register') env.append_flags('CXXFLAGS', '-Wno-error=register')