diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-09-13 11:46:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-14 22:22:13 +0100 |
commit | 2e8c59d059b21dce23c848e837bd98de5e21dafd (patch) | |
tree | ef1735981d6f15bd433e10a7301efcb8b8ca024a /meta/recipes-graphics/piglit/piglit_git.bb | |
parent | 26e46e6d902a952fd884f61460ec11b8aca01917 (diff) | |
download | poky-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/recipes-graphics/piglit/piglit_git.bb')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
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/" | |||
30 | PACKAGECONFIG ??= "" | 31 | PACKAGECONFIG ??= "" |
31 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," | 32 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," |
32 | 33 | ||
33 | LDFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-ldl', '', d)}" | ||
34 | |||
35 | do_configure_prepend() { | 34 | do_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 |