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

fix up packages for new architecture.

Browse Source
This commit is contained in:
Todd Gamblin 2016-06-16 01:47:20 -07:00
parent 40d25d9062
commit 76dfaa71a7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ def install(self, spec, prefix):
configure(*options) configure(*options)
make('all') make('all')
if spec.architecture.startswith('darwin'): if spec.satisfies('platform=darwin'):
mkdirp(prefix.bin) mkdirp(prefix.bin)
for filename in glob("bin/*.x"): for filename in glob("bin/*.x"):
install(filename, prefix.bin) install(filename, prefix.bin)

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

@ -37,7 +37,7 @@ class Libpciaccess(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
# libpciaccess does not support OS X # libpciaccess does not support OS X
if spec.satisfies('arch=darwin-x86_64'): if spec.satisfies('platform=darwin'):
# create a dummy directory # create a dummy directory
mkdir(prefix.lib) mkdir(prefix.lib)
return return

12
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -267,16 +267,16 @@ def install(self, spec, prefix):
if '+all_targets' not in spec: # all is default on cmake if '+all_targets' not in spec: # all is default on cmake
targets = ['CppBackend', 'NVPTX', 'AMDGPU'] targets = ['CppBackend', 'NVPTX', 'AMDGPU']
if 'x86' in spec.architecture.lower(): if 'x86' in spec.architecture.target.lower():
targets.append('X86') targets.append('X86')
elif 'arm' in spec.architecture.lower(): elif 'arm' in spec.architecture.target.lower():
targets.append('ARM') targets.append('ARM')
elif 'aarch64' in spec.architecture.lower(): elif 'aarch64' in spec.architecture.target.lower():
targets.append('AArch64') targets.append('AArch64')
elif 'sparc' in spec.architecture.lower(): elif 'sparc' in spec.architecture.target.lower():
targets.append('sparc') targets.append('sparc')
elif ('ppc' in spec.architecture.lower() or elif ('ppc' in spec.architecture.target.lower() or
'power' in spec.architecture.lower()): 'power' in spec.architecture.target.lower()):
targets.append('PowerPC') targets.append('PowerPC')
cmake_args.append('-DLLVM_TARGETS_TO_BUILD:Bool=' + ';'.join(targets)) cmake_args.append('-DLLVM_TARGETS_TO_BUILD:Bool=' + ';'.join(targets))

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

@ -57,7 +57,7 @@ class Lua(Package):
placement='luarocks') placement='luarocks')
def install(self, spec, prefix): def install(self, spec, prefix):
if spec.satisfies("arch=darwin-i686") or spec.satisfies("arch=darwin-x86_64"): if spec.satisfies("platform=darwin"):
target = 'macosx' target = 'macosx'
else: else:
target = 'linux' target = 'linux'