diff options
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch | 41 | ||||
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch | 54 |
2 files changed, 0 insertions, 95 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch deleted file mode 100644 index 2e1c9476f2..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Backport patch to fix build with gold linker. | ||
2 | |||
3 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
4 | Upstream-Status: Backport | ||
5 | |||
6 | |||
7 | |||
8 | From 93a7113485cf1c55fd7076116faf5b3a690706b2 Mon Sep 17 00:00:00 2001 | ||
9 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | Date: Tue, 30 Aug 2016 17:17:28 +0300 | ||
11 | Subject: [PATCH] cmake: Link test utils with "-ldl" | ||
12 | |||
13 | Without this linking CXX executables (e.g. fbo-blit-stretch) fails | ||
14 | with gold linker: | ||
15 | |||
16 | | libpiglitutil_gl.so.0: error: undefined reference to 'dlsym' | ||
17 | | libpiglitutil_gl.so.0: error: undefined reference to 'dlerror' | ||
18 | | libpiglitutil_gl.so.0: error: undefined reference to 'dlopen' | ||
19 | |||
20 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
21 | Reviewed-by: Emil Velikov <emil.velikov@collabora.com> | ||
22 | --- | ||
23 | tests/util/CMakeLists.txt | 2 ++ | ||
24 | 1 file changed, 2 insertions(+) | ||
25 | |||
26 | diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt | ||
27 | index e1f8073..3d5bef5 100644 | ||
28 | --- a/tests/util/CMakeLists.txt | ||
29 | +++ b/tests/util/CMakeLists.txt | ||
30 | @@ -11,6 +11,8 @@ set_source_files_properties( | ||
31 | PROPERTIES GENERATED 1 | ||
32 | ) | ||
33 | |||
34 | +link_libraries(${CMAKE_DL_LIBS}) | ||
35 | + | ||
36 | if(HAVE_LIBCACA) | ||
37 | link_libraries(caca) | ||
38 | endif() | ||
39 | -- | ||
40 | 2.9.3 | ||
41 | |||
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 deleted file mode 100644 index 845804dd66..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 5 Jul 2016 10:56:23 +0300 | ||
4 | Subject: [PATCH] cmake: Link utils with xcb explicitly | ||
5 | |||
6 | Linking with g++ can reportedly lead to: | ||
7 | |||
8 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect' | ||
9 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup' | ||
10 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator' | ||
11 | |||
12 | This may have appeared now because xcb-dri2 used to overlink publicly | ||
13 | but now does not. | ||
14 | |||
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
16 | Upstream-Status: Accepted | ||
17 | --- | ||
18 | CMakeLists.txt | 1 + | ||
19 | tests/util/CMakeLists.txt | 2 ++ | ||
20 | 2 files changed, 3 insertions(+) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 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") | ||
34 | diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt | ||
35 | index 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 | -- | ||
53 | 2.1.4 | ||
54 | |||