Merge pull request #13684 from jfgrimm/20210810162049_new_pr_libepoxy154

Enable EGL in recent libepoxy ECs
easybuilders · Aug 11, 2021 · d8efe5a · d8efe5a
2 parents 6a61b00 + e54a059
commit d8efe5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.4-GCCcore-10.2.0.eb b/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.4-GCCcore-10.2.0.eb
@@ -25,10 +25,11 @@ dependencies = [
     ('Mesa', '20.2.1'),
 ]
 
-configopts = '-Degl=no --libdir %(installdir)s/lib '
+configopts = '-Degl=yes --libdir %(installdir)s/lib '
 
 sanity_check_paths = {
-    'files': ['include/epoxy/%s' % x for x in ['common.h', 'gl_generated.h', 'gl.h', 'glx_generated.h', 'glx.h']] +
+    'files': ['include/epoxy/%s.h' % x for x in ['common', 'egl_generated', 'egl', 'gl_generated',
+                                                 'gl', 'glx_generated', 'glx']] +
              ['lib/libepoxy.%s' % SHLIB_EXT],
     'dirs': ['lib']
 }

diff --git a/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.4-GCCcore-9.3.0.eb b/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.4-GCCcore-9.3.0.eb
@@ -25,10 +25,11 @@ dependencies = [
     ('Mesa', '20.0.2'),
 ]
 
-configopts = '-Degl=no --libdir %(installdir)s/lib '
+configopts = '-Degl=yes --libdir %(installdir)s/lib '
 
 sanity_check_paths = {
-    'files': ['include/epoxy/%s' % x for x in ['common.h', 'gl_generated.h', 'gl.h', 'glx_generated.h', 'glx.h']] +
+    'files': ['include/epoxy/%s.h' % x for x in ['common', 'egl_generated', 'egl', 'gl_generated',
+                                                 'gl', 'glx_generated', 'glx']] +
              ['lib/libepoxy.%s' % SHLIB_EXT],
     'dirs': ['lib']
 }

diff --git a/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.8-GCCcore-10.3.0.eb b/easybuild/easyconfigs/l/libepoxy/libepoxy-1.5.8-GCCcore-10.3.0.eb
@@ -25,10 +25,11 @@ dependencies = [
     ('Mesa', '21.1.1'),
 ]
 
-configopts = '-Degl=no --libdir %(installdir)s/lib '
+configopts = '-Degl=yes --libdir %(installdir)s/lib '
 
 sanity_check_paths = {
-    'files': ['include/epoxy/%s' % x for x in ['common.h', 'gl_generated.h', 'gl.h', 'glx_generated.h', 'glx.h']] +
+    'files': ['include/epoxy/%s.h' % x for x in ['common', 'egl_generated', 'egl', 'gl_generated',
+                                                 'gl', 'glx_generated', 'glx']] +
              ['lib/libepoxy.%s' % SHLIB_EXT],
     'dirs': ['lib']
 }