summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-07-19 15:16:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:28 +0100
commit0e63414bc39ca12049d49dd0c8b132fdb22f0d22 (patch)
tree65d7864276959f6f8a04e3d5cc5c3acfff1415ea
parentad625f7f9bb1e47cf92b99c21c4c0a278c643d4e (diff)
downloadpoky-0e63414bc39ca12049d49dd0c8b132fdb22f0d22.tar.gz
piglit: Add build fix patch
Fixes [YOCTO #9851] (fingers crossed). (From OE-Core rev: 913149f269679bda87badb94e1de66646fdc5362) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch54
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb1
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 @@
1From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 5 Jul 2016 10:56:23 +0300
4Subject: [PATCH] cmake: Link utils with xcb explicitly
5
6Linking with g++ can reportedly lead to:
7
8libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
9libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
10libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
11
12This may have appeared now because xcb-dri2 used to overlink publicly
13but now does not.
14
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16Upstream-Status: Pending
17---
18 CMakeLists.txt | 1 +
19 tests/util/CMakeLists.txt | 2 ++
20 2 files changed, 3 insertions(+)
21
22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index 8e2abba..2e1a473 100644
24--- a/CMakeLists.txt
25+++ b/CMakeLists.txt
26@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
27
28 pkg_check_modules(LIBDRM QUIET libdrm)
29 pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel)
30+ pkg_check_modules(XCB QUIET xcb)
31 pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
32 pkg_check_modules(GLPROTO QUIET glproto)
33 ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
34diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
35index fb22ffa..e1f8073 100644
36--- a/tests/util/CMakeLists.txt
37+++ b/tests/util/CMakeLists.txt
38@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
39
40 list(APPEND UTIL_GL_LIBS
41 ${LIBDRM_LDFLAGS}
42+ ${XCB_LDFLAGS}
43 ${XCB_DRI2_LDFLAGS}
44 )
45
46 list(APPEND UTIL_GL_INCLUDES
47 ${LIBDRM_INCLUDE_DIRS}
48+ ${XCB_INCLUDE_DIRS}
49 ${XCB_DRI2_INCLUDE_DIRS}
50 )
51
52--
532.1.4
54
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"
5SRC_URI = "git://anongit.freedesktop.org/piglit \ 5SRC_URI = "git://anongit.freedesktop.org/piglit \
6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \ 6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ 7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
8 file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
8 " 9 "
9 10
10# From 2016-07-07 11# From 2016-07-07