diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-19 15:16:35 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-25 23:46:58 +0100 |
| commit | 913149f269679bda87badb94e1de66646fdc5362 (patch) | |
| tree | 4f42d4f2de8defdf4104b598c23d74c8636ebe18 | |
| parent | a901956968127b2eb5911d7b91f44fca46e30b25 (diff) | |
| download | openembedded-core-913149f269679bda87badb94e1de66646fdc5362.tar.gz openembedded-core-913149f269679bda87badb94e1de66646fdc5362.tar.bz2 openembedded-core-913149f269679bda87badb94e1de66646fdc5362.zip | |
piglit: Add build fix patch
Fixes [YOCTO #9851] (fingers crossed).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch | 54 | ||||
| -rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch new file mode 100644 index 0000000000..d591da5d6b --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch @@ -0,0 +1,54 @@ +From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 5 Jul 2016 10:56:23 +0300 +Subject: [PATCH] cmake: Link utils with xcb explicitly + +Linking with g++ can reportedly lead to: + +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect' +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup' +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator' + +This may have appeared now because xcb-dri2 used to overlink publicly +but now does not. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Pending +--- + CMakeLists.txt | 1 + + tests/util/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e2abba..2e1a473 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + + pkg_check_modules(LIBDRM QUIET libdrm) + pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel) ++ pkg_check_modules(XCB QUIET xcb) + pkg_check_modules(XCB_DRI2 QUIET xcb-dri2) + pkg_check_modules(GLPROTO QUIET glproto) + ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt +index fb22ffa..e1f8073 100644 +--- a/tests/util/CMakeLists.txt ++++ b/tests/util/CMakeLists.txt +@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + + list(APPEND UTIL_GL_LIBS + ${LIBDRM_LDFLAGS} ++ ${XCB_LDFLAGS} + ${XCB_DRI2_LDFLAGS} + ) + + list(APPEND UTIL_GL_INCLUDES + ${LIBDRM_INCLUDE_DIRS} ++ ${XCB_INCLUDE_DIRS} + ${XCB_DRI2_INCLUDE_DIRS} + ) + +-- +2.1.4 + diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index be54b59a1a..811f7af73f 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://anongit.freedesktop.org/piglit \ file://0001-cmake-install-bash-completions-in-the-right-place.patch \ file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ + file://0001-cmake-Link-utils-with-xcb-explicitly.patch \ " # From 2016-07-07 |