diff options
| author | Igor Gnatenko <[email protected]> | 2015-07-07 13:05:04 +0300 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-08-01 17:14:02 +0100 |
| commit | 4d7e0fa8c731776ad5d630f37b36c535f1907371 (patch) | |
| tree | 60e4d46e7c21842777ac01b366ebb84aa67e86d9 | |
| parent | 2b831334e95e80e1a53dcce2fab21b012d3384c7 (diff) | |
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" <[email protected]>
Reported-by: Fabian Deutsch <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73512
Signed-off-by: Igor Gnatenko <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Acked-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/mesa.icd | 1 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/mesa.icd.in | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2fc5a2592d0..248f6183172 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 441b438d339..4ab706ef2ac 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib@[email protected] lib@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 6a6a8706d7c..00000000000 --- 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 00000000000..1b77b4e4929 --- /dev/null +++ b/src/gallium/targets/opencl/mesa.icd.in @@ -0,0 +1 @@ +lib@[email protected].@OPENCL_VERSION@ |