/[packages]/cauldron/mesa/current/SOURCES/0013-isl-fix-automake-build-when-sse41-is-not-supported.patch
ViewVC logotype

Contents of /cauldron/mesa/current/SOURCES/0013-isl-fix-automake-build-when-sse41-is-not-supported.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1379265 - (show annotations) (download)
Wed Mar 20 17:08:42 2019 UTC (2 months ago) by tmb
File size: 1674 byte(s)
more fixes from staging/19.0 branch
1 From f028945c01470a8d69c469a00c76429c7611d55f Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
3 Date: Fri, 15 Mar 2019 12:32:09 +0200
4 Subject: [PATCH 13/24] isl: fix automake build when sse41 is not supported
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 Fixes: 864cc419eb0a41882762 "intel/isl: move tiled_memcpy static libs from i965 to isl"
10 Cc: mesa-stable@lists.freedesktop.org
11 Reported-by: Milav Soni <milav.soni@teqdiligent.com>
12 Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
13 Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
14 (cherry picked from commit a1cd0040b6d1ae3dbf9d792c5ab1aadbbf917bac)
15 ---
16 src/intel/Makefile.isl.am | 11 +++++++----
17 1 file changed, 7 insertions(+), 4 deletions(-)
18
19 diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am
20 index a6733f3ba8e..dcb9d3ad6fc 100644
21 --- a/src/intel/Makefile.isl.am
22 +++ b/src/intel/Makefile.isl.am
23 @@ -33,12 +33,15 @@ ISL_GEN_LIBS = \
24
25 noinst_LTLIBRARIES += $(ISL_GEN_LIBS) \
26 isl/libisl.la \
27 - libisl_tiled_memcpy.la \
28 - libisl_tiled_memcpy_sse41.la
29 + libisl_tiled_memcpy.la
30
31 isl_libisl_la_LIBADD = $(ISL_GEN_LIBS) \
32 - libisl_tiled_memcpy.la \
33 - libisl_tiled_memcpy_sse41.la
34 + libisl_tiled_memcpy.la
35 +
36 +if SSE41_SUPPORTED
37 +isl_libisl_la_LIBADD += libisl_tiled_memcpy_sse41.la
38 +noinst_LTLIBRARIES += libisl_tiled_memcpy_sse41.la
39 +endif
40
41 isl_libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES)
42
43 --
44 2.21.0
45

  ViewVC Help
Powered by ViewVC 1.1.26