Attachment 99773 Details for Bug 73512 – [PATCH rebased] opencl: use versioned .so in mesa.icd

[PATCH rebased] opencl: use versioned .so in mesa.icd

0001-opencl-use-versioned-.so-in-mesa.icd.patch (text/plain), 2.49 KB, created by Igor Gnatenko on 2014-05-25 14:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2014-05-25 14:25:55 UTC

Size: 2.49 KB

patch

obsolete

>From 53ce555f81e183039762c469c95ea0f1ebcf7fa3 Mon Sep 17 00:00:00 2001
>From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>Date: Sun, 12 Jan 2014 02:09:16 +0400
>Subject: [PATCH rebased] 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
>index 7397341..6d063a8 100644
>--- 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
> LIBDRM_REQUIRED=2.4.38
>@@ -2202,6 +2204,7 @@ AC_CONFIG_FILES([Makefile
> 		src/gallium/targets/egl-static/Makefile
> 		src/gallium/targets/gbm/Makefile
> 		src/gallium/targets/opencl/Makefile
>+		src/gallium/targets/opencl/mesa.icd
> 		src/gallium/targets/xa/Makefile
> 		src/gallium/targets/xa/xatracker.pc
> 		src/gallium/targets/omx-nouveau/Makefile
>diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
>index 55a73b4..3a6fafe 100644
>--- a/src/gallium/targets/opencl/Makefile.am
>+++ b/src/gallium/targets/opencl/Makefile.am
>@@ -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 \
> if HAVE_LD_VERSION_SCRIPT
> 	-Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym \
> endif
>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@
>-- 
>1.9.3
>

Actions: View

Attachments on bug 73512: 91884 | 91885 | 91886 | 91973 | 92004 | 92091 | 98450 | 99773

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.