From 5cd1e08e8a800fc9c6c5b04d815186b80dcadb98 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 3 Mar 2022 03:39:47 -0600 Subject: libdrm: new versions up to v2.4.110, build system meson (#27253) --- var/spack/repos/builtin/packages/libdrm/package.py | 47 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index c7def0f9c6..1c9265e17e 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -6,13 +6,20 @@ from spack import * -class Libdrm(AutotoolsPackage): +class Libdrm(Package): """A userspace library for accessing the DRM, direct rendering manager, on Linux, BSD and other systems supporting the ioctl interface.""" homepage = "https://dri.freedesktop.org/libdrm/" - url = "https://dri.freedesktop.org/libdrm/libdrm-2.4.59.tar.gz" + url = "https://dri.freedesktop.org/libdrm/libdrm-2.4.101.tar.xz" + list_url = "https://dri.freedesktop.org/libdrm/" + maintainers = ['wdconinc'] + + version('2.4.110', sha256='eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737') + version('2.4.109', sha256='629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26') + version('2.4.108', sha256='a1d7948cbc536763fde14b4beb5e4da7867607966d4cf46301087e8b8fe3d6a0') + version('2.4.107', sha256='c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888') version('2.4.100', sha256='6a5337c054c0c47bc16607a21efa2b622e08030be4101ef4a241c5eb05b6619b') version('2.4.81', sha256='64036c5e0668fdc2b820dcc0ebab712f44fd2c2147d23dc5a6e003b19f0d3e9f') version('2.4.75', sha256='a411bff814b4336c8908dcbd045cd89fdc7afedc75b795d897d462e467cbb01d') @@ -26,6 +33,28 @@ class Libdrm(AutotoolsPackage): depends_on('libpciaccess@0.10:') depends_on('libpthread-stubs') + def url_for_version(self, version): + if version <= Version('2.4.100'): + return self.list_url + 'libdrm-%s.tar.gz' % version + else: + return self.list_url + 'libdrm-%s.tar.xz' % version + + def meson_args(self): + args = [] + return args + + def install(self, spec, prefix): + with working_dir('spack-build', create=True): + args = [] + args.extend(std_meson_args) + args.extend(self.meson_args()) + meson('..', *args) + ninja('-v') + if self.run_tests: + ninja('test') + ninja('install') + + @when('@:2.4.100') def configure_args(self): args = [] args.append('--enable-static') @@ -33,6 +62,18 @@ class Libdrm(AutotoolsPackage): # Needed to fix build for spack/spack#1740, but breaks newer # builds/compilers args.append('LIBS=-lrt') - if self.spec.satisfies('%gcc@10.0.0:') or self.spec.satisfies('%clang@11.0.0:') or self.spec.satisfies('%aocc@2.3.0:'): + if (self.spec.satisfies('%gcc@10.0.0:') or + self.spec.satisfies('%clang@11.0.0:') or + self.spec.satisfies('%aocc@2.3.0:')): args.append('CFLAGS=-fcommon') return args + + @when('@:2.4.100') + def install(self, spec, prefix): + configure('--prefix={0}'.format(prefix), *self.configure_args()) + make() + if self.run_tests: + make('check') + make('install') + if self.run_tests: + make('installcheck') -- cgit v1.2.3-70-g09d2