From 16ff38b784b9ca96e02ef9d22ed07754aa3a4b76 Mon Sep 17 00:00:00 2001
From: Gregory Lee <lee218@llnl.gov>
Date: Mon, 24 Jun 2019 14:57:17 -0700
Subject: [PATCH] add glx variant to libepoxy (#11814)
---
.../repos/builtin/packages/libepoxy/package.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py
index 7165f27948..965d7612f2 100644
--- a/var/spack/repos/builtin/packages/libepoxy/package.py
+++ b/var/spack/repos/builtin/packages/libepoxy/package.py
@@ -19,9 +19,22 @@ class Libepoxy(AutotoolsPackage):
depends_on('pkgconfig', type='build')
depends_on('meson')
depends_on('gl')
+ depends_on('libx11', when='+glx')
+
+ variant('glx', default=True, description='enable GLX support')
def configure_args(self):
# Disable egl, otherwise configure fails with:
# error: Package requirements (egl) were not met
# Package 'egl', required by 'virtual:world', not found
- return ['--enable-egl=no']
+ args = ['--enable-egl=no']
+
+ # --enable-glx defaults to auto and was failing on PPC64LE systems
+ # because libx11 was missing from the dependences. This explicitly
+ # enables/disables glx support.
+ if '+glx' in self.spec:
+ args.append('--enable-glx=yes')
+ else:
+ args.append('--enable-glx=no')
+
+ return args
--
GitLab