We must have versioned library in mesa.icd, because ICD loader would fail if the mesa-devel package wasn't installed. Cc: "10.6" <mesa-stable@lists.freedesktop.org> Reported-by: Fabian Deutsch <fabian.deutsch@gmx.de> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73512 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Michel Dänzer <michel.daenzer@amd.com>tags/11.0-branchpoint
@@ -64,6 +64,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) | |||
dnl Set internal versions | |||
OSMESA_VERSION=8 | |||
AC_SUBST([OSMESA_VERSION]) | |||
OPENCL_VERSION=1 | |||
AC_SUBST([OPENCL_VERSION]) | |||
dnl Versions for external dependencies | |||
LIBDRM_REQUIRED=2.4.60 | |||
@@ -2336,6 +2338,7 @@ AC_CONFIG_FILES([Makefile | |||
src/gallium/targets/libgl-xlib/Makefile | |||
src/gallium/targets/omx/Makefile | |||
src/gallium/targets/opencl/Makefile | |||
src/gallium/targets/opencl/mesa.icd | |||
src/gallium/targets/osmesa/Makefile | |||
src/gallium/targets/osmesa/osmesa.pc | |||
src/gallium/targets/pipe-loader/Makefile |
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la | |||
lib@OPENCL_LIBNAME@_la_LDFLAGS = \ | |||
$(LLVM_LDFLAGS) \ | |||
-no-undefined \ | |||
-version-number 1:0 \ | |||
-version-number @OPENCL_VERSION@:0 \ | |||
$(GC_SECTIONS) \ | |||
$(LD_NO_UNDEFINED) | |||
@@ -1 +0,0 @@ | |||
libMesaOpenCL.so |
@@ -0,0 +1 @@ | |||
lib@OPENCL_LIBNAME@.so.@OPENCL_VERSION@ |