summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-09-13 11:46:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:13 +0100
commit2e8c59d059b21dce23c848e837bd98de5e21dafd (patch)
treeef1735981d6f15bd433e10a7301efcb8b8ca024a /meta
parent26e46e6d902a952fd884f61460ec11b8aca01917 (diff)
downloadpoky-2e8c59d059b21dce23c848e837bd98de5e21dafd.tar.gz
piglit: Backport linker flag patch
Use the correct build system patch instead of adding linker flags in recipe. Also update upstream status for the other build patch. Fixes [YOCTO #9851]. (From OE-Core rev: cd67959c4794b132cb9fd20a2a37cf862e172bed) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch41
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch2
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb3
3 files changed, 43 insertions, 3 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
new file mode 100644
index 0000000000..2e1c9476f2
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch
@@ -0,0 +1,41 @@
1Backport patch to fix build with gold linker.
2
3Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
4Upstream-Status: Backport
5
6
7
8From 93a7113485cf1c55fd7076116faf5b3a690706b2 Mon Sep 17 00:00:00 2001
9From: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Date: Tue, 30 Aug 2016 17:17:28 +0300
11Subject: [PATCH] cmake: Link test utils with "-ldl"
12
13Without this linking CXX executables (e.g. fbo-blit-stretch) fails
14with 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
20Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
21Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
22---
23 tests/util/CMakeLists.txt | 2 ++
24 1 file changed, 2 insertions(+)
25
26diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
27index 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--
402.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
index d591da5d6b..845804dd66 100644
--- 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
@@ -13,7 +13,7 @@ This may have appeared now because xcb-dri2 used to overlink publicly
13but now does not. 13but now does not.
14 14
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16Upstream-Status: Pending 16Upstream-Status: Accepted
17--- 17---
18 CMakeLists.txt | 1 + 18 CMakeLists.txt | 1 +
19 tests/util/CMakeLists.txt | 2 ++ 19 tests/util/CMakeLists.txt | 2 ++
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index b2ca55322f..82adcdeca1 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -6,6 +6,7 @@ SRC_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 file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
9 file://0001-cmake-Link-test-utils-with-ldl.patch \
9 " 10 "
10 11
11# From 2016-07-07 12# From 2016-07-07
@@ -30,8 +31,6 @@ do_compile[dirs] =+ "${B}/temp/"
30PACKAGECONFIG ??= "" 31PACKAGECONFIG ??= ""
31PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," 32PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
32 33
33LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-ldl', '', d)}"
34
35do_configure_prepend() { 34do_configure_prepend() {
36 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then 35 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
37 sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h 36 sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h