diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2014-05-05 10:16:25 +0400 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2014-05-05 12:12:15 +0400 |
| commit | 000ebe36bee1b4c1c5a342804744ff5bea841aa2 (patch) | |
| tree | afee3551e3db36eb4876241f2a64e7e2b456ff0f /0001-opencl-use-versioned-.so-in-mesa.icd.patch | |
| parent | fcf27045cbe533eb5fddaa3bb4d74825d754a4eb (diff) | |
| download | mesa-000ebe36bee1b4c1c5a342804744ff5bea841aa2.tar.gz mesa-000ebe36bee1b4c1c5a342804744ff5bea841aa2.tar.xz mesa-000ebe36bee1b4c1c5a342804744ff5bea841aa2.zip | |
10.2-rc1 upstream release
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to '0001-opencl-use-versioned-.so-in-mesa.icd.patch')
| -rw-r--r-- | 0001-opencl-use-versioned-.so-in-mesa.icd.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/0001-opencl-use-versioned-.so-in-mesa.icd.patch b/0001-opencl-use-versioned-.so-in-mesa.icd.patch index 2875e57..56cd389 100644 --- a/0001-opencl-use-versioned-.so-in-mesa.icd.patch +++ b/0001-opencl-use-versioned-.so-in-mesa.icd.patch @@ -1,4 +1,4 @@ -From 348caa4b9ab2b00871c8ea73aaf59311f9a853e8 Mon Sep 17 00:00:00 2001 +From 6da9f2a229a1b519e8cd1f794d6c2a63fedfa92e 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] opencl: use versioned .so in mesa.icd @@ -19,7 +19,7 @@ Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> create mode 100644 src/gallium/targets/opencl/mesa.icd.in diff --git a/configure.ac b/configure.ac -index 4da6c51..c195b1b 100644 +index e77ed77..e363c03 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -30,28 +30,28 @@ index 4da6c51..c195b1b 100644 +AC_SUBST([OPENCL_VERSION]) dnl Versions for external dependencies - LIBDRM_REQUIRED=2.4.24 -@@ -2023,6 +2025,7 @@ AC_CONFIG_FILES([Makefile + LIBDRM_REQUIRED=2.4.38 +@@ -2084,6 +2086,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/osmesa/Makefile - src/gallium/targets/osmesa/osmesa.pc - src/gallium/targets/pipe-loader/Makefile + 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 653302c..3b257ca 100644 +index ba45aee..0a3d134 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am -@@ -4,7 +4,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la - +@@ -5,7 +5,7 @@ lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la lib@OPENCL_LIBNAME@_la_LDFLAGS = \ $(LLVM_LDFLAGS) \ -- -version-number 1:0 -+ -version-number @OPENCL_VERSION@:0 - - lib@OPENCL_LIBNAME@_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ + -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) diff --git a/src/gallium/targets/opencl/mesa.icd b/src/gallium/targets/opencl/mesa.icd deleted file mode 100644 index 6a6a870..0000000 @@ -67,5 +67,5 @@ index 0000000..1b77b4e @@ -0,0 +1 @@ +lib@OPENCL_LIBNAME@.so.@OPENCL_VERSION@ -- -1.8.4.2 +1.9.0 |