From 49df20f1ef970df3e64db800bf03dd30b2114c33 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 29 Aug 2020 15:39:02 -0500 Subject: [PATCH] [libdrm] AutotoolsPackage; %gcc@10.0.0 requires CFLAGS=-fcommon (#18393) * [libdrm] AutotoolsPackage; %gcc@10.0.0 requires CFLAGS=-fcommon * [libdrm] placate flake8 --- .../repos/builtin/packages/libdrm/package.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index 82f55a9955f..adc2964678b 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -7,7 +7,7 @@ import sys -class Libdrm(Package): +class Libdrm(AutotoolsPackage): """A userspace library for accessing the DRM, direct rendering manager, on Linux, BSD and other systems supporting the ioctl interface.""" @@ -25,11 +25,10 @@ class Libdrm(Package): depends_on('libpciaccess@0.10:', when=(sys.platform != 'darwin')) depends_on('libpthread-stubs') - def install(self, spec, prefix): - configure('--prefix={0}'.format(prefix), - '--enable-static', - 'LIBS=-lrt') # This fixes a bug with `make check` - - make() - make('check') - make('install') + def configure_args(self): + args = [] + args.append('--enable-static') + args.append('LIBS=-lrt') # This fixes a bug with `make check` + if self.spec.satisfies('%gcc@10.0.0:'): + args.append('CFLAGS=-fcommon') + return args