Mesa (master): opencl: use versioned .so in mesa.icd

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 4d7e0fa8c731776ad5d630f37b36c535f1907371
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d7e0fa8c731776ad5d630f37b36c535f1907371

Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Tue Jul  7 13:05:04 2015 +0300

opencl: use versioned .so in mesa.icd

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 at lists.freedesktop.org>
Reported-by: Fabian Deutsch <fabian.deutsch at gmx.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73512
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Acked-by: Michel Dänzer <michel.daenzer at amd.com>

---

 configure.ac                           |    3 +++
 src/gallium/targets/opencl/Makefile.am |    2 +-
 src/gallium/targets/opencl/mesa.icd    |    1 -
 src/gallium/targets/opencl/mesa.icd.in |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2fc5a25..248f618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index 441b438..4ab706e 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib at OPENCL_LIBNAME@.la
 lib at OPENCL_LIBNAME@_la_LDFLAGS = \
 	$(LLVM_LDFLAGS) \
 	-no-undefined \
-	-version-number 1:0 \
+	-version-number @OPENCL_VERSION@:0 \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)
 
diff --git a/src/gallium/targets/opencl/mesa.icd b/src/gallium/targets/opencl/mesa.icd
deleted file mode 100644
index 6a6a870..0000000
--- a/src/gallium/targets/opencl/mesa.icd
+++ /dev/null
@@ -1 +0,0 @@
-libMesaOpenCL.so
diff --git a/src/gallium/targets/opencl/mesa.icd.in b/src/gallium/targets/opencl/mesa.icd.in
new file mode 100644
index 0000000..1b77b4e
--- /dev/null
+++ b/src/gallium/targets/opencl/mesa.icd.in
@@ -0,0 +1 @@
+lib at OPENCL_LIBNAME@.so. at OPENCL_VERSION@