blob: f908d46550e8c861fcb5804ae995409bc0a0f0a0 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 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
Brad Bishop316dfdd2018-06-25 12:45:53 -040023Upstream-Status: Accepted
24https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf
Brad Bishopd7bf8c12018-02-25 22:55:05 -050025
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27---
28 src/intel/Makefile.vulkan.am | 1 +
29 1 file changed, 1 insertion(+)
30
Brad Bishop316dfdd2018-06-25 12:45:53 -040031Index: mesa-17.3.6/src/intel/Makefile.vulkan.am
32===================================================================
33--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am
34+++ mesa-17.3.6/src/intel/Makefile.vulkan.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -050035@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \
36 $(LIBDRM_LIBS) \
37 $(PTHREAD_LIBS) \
38 $(DLOPEN_LIBS) \
39+ $(EXPAT_LIBS) \
40 -lm
41
Brad Bishop316dfdd2018-06-25 12:45:53 -040042 if HAVE_PLATFORM_ANDROID