Skip to content

change Mesa 19.1.7 + 19.2.1 easyconfigs to use custom easyblock for Mesa #9764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 5 commits into from
Mar 23, 2020
Merged

change Mesa 19.1.7 + 19.2.1 easyconfigs to use custom easyblock for Mesa #9764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6db1ad6
Extracting Mesa changes from https://github.com/easybuilders/easybuil…
edmondac Jan 23, 2020
369a7e1
swr-arches now set by the mesa easyblock
edmondac Mar 9, 2020
3a91627
remove custom sanity_check_paths in Mesa 19.1.7 and 19.2.1 easyconfig…
boegel Mar 21, 2020
deac762
Merge pull request #97 from boegel/20200123091947_new_pr_Mesa1917
edmondac Mar 23, 2020
4ef1700
Merge branch 'develop' of https://github.com/easybuilders/easybuild-e…
edmondac Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions easybuild/easyconfigs/m/Mesa/Mesa-19.1.7-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# it will try to use the llvmpipe by default. It you want swr, do:
# GALLIUM_DRIVER=swr

easyblock = 'MesonNinja'

name = 'Mesa'
version = '19.1.7'

Expand Down Expand Up @@ -54,23 +52,8 @@ dependencies = [
]

configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri3=false -Ddri-drivers='' -Dvulkan-drivers=''"
configopts += " -Dgbm=false -Dglx-direct=false -Dgallium-drivers='swrast,swr' -Degl=false"
configopts += " -Dgbm=false -Dglx-direct=false -Degl=false"
configopts += " -Dllvm=true -Dshared-llvm=true"
configopts += " -Dlibunwind=true -Dglx=gallium-xlib"

# also install header files located include/GL/internal/
# we can't enable both DRI and Gallium drivers, but we can provide the DRI header file (GL/internal/dri_interface.h)
postinstallcmds = ["cp -a %(builddir)s/mesa-%(version)s/include/GL/internal %(installdir)s/include/GL/"]

sanity_check_paths = {
'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
'include/GL/glext.h', 'include/GL/gl_mangle.h',
'include/GL/glx.h', 'include/GL/osmesa.h',
'include/GL/gl.h', 'include/GL/glxext.h',
'include/GL/glx_mangle.h', 'include/GLES/gl.h',
'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
'dirs': ['include/GL/internal'],
}

moduleclass = 'vis'
14 changes: 0 additions & 14 deletions easybuild/easyconfigs/m/Mesa/Mesa-19.2.1-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# it will try to use the llvmpipe by default. It you want swr, do:
# GALLIUM_DRIVER=swr

easyblock = 'MesonNinja'

name = 'Mesa'
version = '19.2.1'

Expand Down Expand Up @@ -61,7 +59,6 @@ dependencies = [
]

configopts = " -Dplatforms=x11 -Dosmesa=gallium -Ddri-drivers='' -Dvulkan-drivers=''"
configopts += " -Dgallium-drivers='swrast,swr' -Dswr-arches=avx,avx2,skx,knl"
configopts += " -Dllvm=true -Dshared-llvm=true"
configopts += " -Dlibunwind=true"
configopts += " -Dglvnd=true"
Expand All @@ -74,15 +71,4 @@ postinstallcmds = ["ln -s libGLX_mesa.so.0 %(installdir)s/lib/libGLX_indirect.so
# Tells libglvnd where to find EGL libraries
modextrapaths = {"__EGL_VENDOR_LIBRARY_DIRS": "share/glvnd/egl_vendor.d"}

sanity_check_paths = {
'files': ['lib/libGLX_mesa.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
'lib/libEGL_mesa.%s' % SHLIB_EXT,
'include/GL/glext.h', 'include/GL/gl_mangle.h',
'include/GL/glx.h', 'include/GL/osmesa.h',
'include/GL/gl.h', 'include/GL/glxext.h',
'include/GL/glx_mangle.h', 'include/GLES/gl.h',
'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
'dirs': ['include/GL/internal'],
}

moduleclass = 'vis'