From 640a205c8050a0d111c5b847a72053e966e3eae1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 11 Oct 2017 04:19:27 -0400 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...lkan.am-explictly-add-lib-expat-to-intel-.patch | 44 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_17.1.7.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch (limited to 'meta') 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 0000000000..bd1e863491 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -0,0 +1,44 @@ +From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 11 Oct 2017 15:40:42 +0800 +Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel + libvulkan's lib depends + +While built with "-fvisibility=default" +... +|i586-oe-linux-gcc ... -fvisibility=default ... -o common/.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 + +Upstream-Status: Submitted [mesa-dev@lists.freedesktop.org] + +Signed-off-by: Hongxu Jia +--- + src/intel/Makefile.vulkan.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am +index 271b0a5..8fbe2c8 100644 +--- a/src/intel/Makefile.vulkan.am ++++ b/src/intel/Makefile.vulkan.am +@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ + $(LIBDRM_LIBS) \ + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) \ ++ $(EXPAT_LIBS) \ + -lm + + if HAVE_PLATFORM_X11 +-- +2.7.4 + diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.1.7.bb index a50f32c025..39cfce992f 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 \ file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ file://0001-winsys-svga-drm-Include-sys-types.h.patch \ file://0001-configure.ac-Always-check-for-expat.patch \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ " SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207" SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5" -- cgit v1.2.3-54-g00ecf