2014-05-05 06:16:25 +00:00
|
|
|
From 6da9f2a229a1b519e8cd1f794d6c2a63fedfa92e Mon Sep 17 00:00:00 2001
|
2014-01-18 20:06:01 +00:00
|
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
|
|
Date: Sun, 12 Jan 2014 02:09:16 +0400
|
|
|
|
|
Subject: [PATCH] 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.
|
|
|
|
|
|
|
|
|
|
Reported-by: Fabian Deutsch <fabian.deutsch@gmx.de>
|
|
|
|
|
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=73512
|
|
|
|
|
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.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(-)
|
|
|
|
|
delete mode 100644 src/gallium/targets/opencl/mesa.icd
|
|
|
|
|
create mode 100644 src/gallium/targets/opencl/mesa.icd.in
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
2014-05-05 06:16:25 +00:00
|
|
|
index e77ed77..e363c03 100644
|
2014-01-18 20:06:01 +00:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
|
|
|
|
@@ -25,6 +25,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
|
2014-05-05 06:16:25 +00:00
|
|
|
LIBDRM_REQUIRED=2.4.38
|
|
|
|
|
@@ -2084,6 +2086,7 @@ AC_CONFIG_FILES([Makefile
|
2014-01-18 20:06:01 +00:00
|
|
|
src/gallium/targets/egl-static/Makefile
|
|
|
|
|
src/gallium/targets/gbm/Makefile
|
|
|
|
|
src/gallium/targets/opencl/Makefile
|
|
|
|
|
+ src/gallium/targets/opencl/mesa.icd
|
2014-05-05 06:16:25 +00:00
|
|
|
src/gallium/targets/xa/Makefile
|
|
|
|
|
src/gallium/targets/xa/xatracker.pc
|
|
|
|
|
src/gallium/targets/omx-nouveau/Makefile
|
2014-01-18 20:06:01 +00:00
|
|
|
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
|
2014-05-05 06:16:25 +00:00
|
|
|
index ba45aee..0a3d134 100644
|
2014-01-18 20:06:01 +00:00
|
|
|
--- a/src/gallium/targets/opencl/Makefile.am
|
|
|
|
|
+++ b/src/gallium/targets/opencl/Makefile.am
|
2014-05-05 06:16:25 +00:00
|
|
|
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la
|
2014-01-18 20:06:01 +00:00
|
|
|
lib@OPENCL_LIBNAME@_la_LDFLAGS = \
|
|
|
|
|
$(LLVM_LDFLAGS) \
|
2014-05-05 06:16:25 +00:00
|
|
|
-no-undefined \
|
|
|
|
|
- -version-number 1:0 \
|
|
|
|
|
+ -version-number @OPENCL_VERSION@:0 \
|
|
|
|
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym \
|
|
|
|
|
$(GC_SECTIONS) \
|
|
|
|
|
$(LD_NO_UNDEFINED)
|
2014-01-18 20:06:01 +00:00
|
|
|
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@OPENCL_LIBNAME@.so.@OPENCL_VERSION@
|
|
|
|
|
--
|
2014-05-05 06:16:25 +00:00
|
|
|
1.9.0
|
2014-01-18 20:06:01 +00:00
|
|
|
|
