summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-10-11 08:19:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 22:52:44 (GMT)
commit640a205c8050a0d111c5b847a72053e966e3eae1 (patch)
treef5227b35443f30f4f31290d6e364416b77eebe7f /meta
parent75f3ce2d4715d9c6bcf5412d9064ae31fa9f8187 (diff)
downloadpoky-640a205c8050a0d111c5b847a72053e966e3eae1.tar.gz
mesa: explictly add lib expat to intel libvulkan's lib depends
While built with "-fvisibility=default" ... |i586-oe-linux-gcc ... -fvisibility=default ... -o ommon/.libs/ common_libintel_common_la-gen_decoder.o ... It triggered the failure ... |i586-oe-linux-g++ ... common/.libs/libintel_common.a ... -o vulkan/.libs/libvulkan_intel.so |common/.libs/libintel_common.a(common_libintel_common_la-gen_decoder.o): |In function `start_element': |/usr/src/debug/mesa/2_17.1.7-r0/mesa-17.1.7/src/intel/common/gen_decoder.c:371: undefined reference to `XML_GetCurrentLineNumber' ... explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS (From OE-Core rev: 12b65b38ca9617cf9162d032c73dd8f4b32cea81) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch44
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.1.7.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
new file mode 100644
index 0000000..bd1e863
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
@@ -0,0 +1,44 @@
1From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 11 Oct 2017 15:40:42 +0800
4Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel
5 libvulkan's lib depends
6
7While built with "-fvisibility=default"
8...
9|i586-oe-linux-gcc ... -fvisibility=default ... -o common/.libs/common_libintel_common_la-gen_decoder.o
10...
11
12It triggered the failure
13...
14|i586-oe-linux-g++ ... common/.libs/libintel_common.a ... -o vulkan/.libs/libvulkan_intel.so
15|common/.libs/libintel_common.a(common_libintel_common_la-gen_decoder.o):
16|In function `start_element':
17|/usr/src/debug/mesa/2_17.1.7-r0/mesa-17.1.7/src/intel/common/gen_decoder.c:371:
18undefined reference to `XML_GetCurrentLineNumber'
19...
20
21explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS
22
23Upstream-Status: Submitted [mesa-dev@lists.freedesktop.org]
24
25Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26---
27 src/intel/Makefile.vulkan.am | 1 +
28 1 file changed, 1 insertion(+)
29
30diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
31index 271b0a5..8fbe2c8 100644
32--- a/src/intel/Makefile.vulkan.am
33+++ b/src/intel/Makefile.vulkan.am
34@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \
35 $(LIBDRM_LIBS) \
36 $(PTHREAD_LIBS) \
37 $(DLOPEN_LIBS) \
38+ $(EXPAT_LIBS) \
39 -lm
40
41 if HAVE_PLATFORM_X11
42--
432.7.4
44
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.1.7.bb
index a50f32c..39cfce9 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.7.bb
@@ -11,6 +11,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
11 file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ 11 file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \
12 file://0001-winsys-svga-drm-Include-sys-types.h.patch \ 12 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
13 file://0001-configure.ac-Always-check-for-expat.patch \ 13 file://0001-configure.ac-Always-check-for-expat.patch \
14 file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \
14 " 15 "
15SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207" 16SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207"
16SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5" 17SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"