Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 11 Oct 2017 15:40:42 +0800 |
| 4 | Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel |
| 5 | libvulkan's lib depends |
| 6 | |
| 7 | While built with "-fvisibility=default" |
| 8 | ... |
| 9 | |i586-oe-linux-gcc ... -fvisibility=default ... -o common/.libs/common_libintel_common_la-gen_decoder.o |
| 10 | ... |
| 11 | |
| 12 | It 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: |
| 18 | undefined reference to `XML_GetCurrentLineNumber' |
| 19 | ... |
| 20 | |
| 21 | explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS |
| 22 | |
| 23 | Upstream-Status: Submitted [mesa-dev@lists.freedesktop.org] |
| 24 | |
| 25 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 26 | --- |
| 27 | src/intel/Makefile.vulkan.am | 1 + |
| 28 | 1 file changed, 1 insertion(+) |
| 29 | |
| 30 | diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am |
| 31 | index 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 | -- |
| 43 | 2.7.4 |
| 44 | |