summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-10-16 16:40:08 +0100
committerEmil Velikov <[email protected]>2017-11-08 14:10:33 +0000
commit6ef9482b78d5c486f4d40785b7f04c3dabf81ff9 (patch)
treea981b2246bc275e28e28fdb01bfff8c5a06ebb08
parent0cd09585441d15ef1ff49de497008103f0b0e1ac (diff)
configure: enable the OpenCL ICD by default
Nearly all the distributions* that build Mesa OpenCL, enable the ICD. Since building a non-ICD driver has the chance of conflicting with existing OpenCL binary (libOpenCL.so). Furthermore, some applications expect the library to provide annotated/versioned symbols. https://lists.freedesktop.org/archives/mesa-dev/2017-September/171093.html *Fedora, Suse, Arch, Debian, Ubuntu, FreeBSD use the ICD Gentoo manages the conflicting files via eselect. Cc: Matt Turner <[email protected]> Cc: Jan Vesely <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> Reviewed-By: Aaron Watry <[email protected]>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index fe1ef948918..929fbceed30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-glx-tls \
--enable-nine \
--enable-opencl \
+ --enable-opencl-icd \
--enable-opengl \
--enable-va \
--enable-vdpau \
diff --git a/configure.ac b/configure.ac
index 0116b90743f..266144b3f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1255,9 +1255,9 @@ AC_ARG_ENABLE([opencl],
AC_ARG_ENABLE([opencl_icd],
[AS_HELP_STRING([--enable-opencl-icd],
[Build an OpenCL ICD library to be loaded by an ICD implementation
- @<:@default=disabled@:>@])],
+ @<:@default=enabled@:>@])],
[enable_opencl_icd="$enableval"],
- [enable_opencl_icd=no])
+ [enable_opencl_icd=yes])
AC_ARG_ENABLE([gallium-tests],
[AS_HELP_STRING([--enable-gallium-tests],