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

mesa: Match rtti settings with the libllvm dependency (#31145)

Browse Source 
* llvm-amdgpu: Update the libllvm version provided

* mesa: Match configure rtti settings to the libllvm dependency
This commit is contained in:
Chuck Atkins 2022-06-15 19:29:33 -04:00 committed by GitHub
parent 0205fefe0c
commit 95888602f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/llvm-amdgpu/package.py
View File

@ -54,7 +54,8 @@ class LlvmAmdgpu(CMakePackage):
provides('libllvm@11', when='@3.5:3.8') provides('libllvm@11', when='@3.5:3.8')
provides('libllvm@12', when='@3.9:4.2') provides('libllvm@12', when='@3.9:4.2')
provides('libllvm@13', when='@4.3:') provides('libllvm@13', when='@4.3:4.9')
provides('libllvm@14', when='@5:')
depends_on('cmake@3.4.3:', type='build', when='@:3.8') depends_on('cmake@3.4.3:', type='build', when='@:3.8')
depends_on('cmake@3.13.4:', type='build', when='@3.9.0:') depends_on('cmake@3.13.4:', type='build', when='@3.9.0:')

11
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -204,6 +204,7 @@ def meson_args(self):
args.append(opt_enable(num_frontends > 1, 'shared-glapi')) args.append(opt_enable(num_frontends > 1, 'shared-glapi'))
if '+llvm' in spec: if '+llvm' in spec:
llvm_config = Executable(spec['libllvm'].prefix.bin.join('llvm-config'))
# Fix builds on hosts where /usr/bin/llvm-config-* is found and provides an # Fix builds on hosts where /usr/bin/llvm-config-* is found and provides an
# incompatible version. Ensure that the llvm-config of spec['libllvm'] is # incompatible version. Ensure that the llvm-config of spec['libllvm'] is
# used. # used.
@ -212,12 +213,18 @@ def meson_args(self):
mkdirp(self.build_directory) mkdirp(self.build_directory)
with working_dir(self.build_directory): with working_dir(self.build_directory):
with open('meson-native-config.ini', 'w') as native_config: with open('meson-native-config.ini', 'w') as native_config:
llvm_config = spec['libllvm'].prefix.bin + '/llvm-config'
native_config.write('[binaries]\n') native_config.write('[binaries]\n')
native_config.write("llvm-config = '{0}'\n".format(llvm_config)) native_config.write(
"llvm-config = '{0}'\n".format(llvm_config.path))
args.append('-Dllvm=enabled') args.append('-Dllvm=enabled')
args.append(opt_enable( args.append(opt_enable(
'+llvm_dylib' in spec['libllvm'], 'shared-llvm')) '+llvm_dylib' in spec['libllvm'], 'shared-llvm'))
# Match the llvm rtti setting
if llvm_config('--has-rtti', error=str, output=str).strip() == 'YES':
args.append('-Dcpp_rtti=true')
else:
args.append('-Dcpp_rtti=false')
else: else:
args.append('-Dllvm=disabled') args.append('-Dllvm=disabled')