On Tue, Jul 19, 2016 at 03:16:35PM +0300, Jussi Kukkonen wrote: > Fixes [YOCTO #9851] (fingers crossed). > > Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> > --- > > This is a potential build fix for a problem Martin reported that I > couldn't reproduce myself.
I'm sorry I haven't replied in the ticket yet, it's because my jenkins build servers are down for last 18 days, because of some power failure in datacenter where they are hosted, so I haven't executed any builds in last 3 weeks and don't know when I'll be able to return to it. +Tom who may provide some updated info about that datacenter issue > I've pushed this on top of the piglit branch that isn't yet merged. > > git://git.yoctoproject.org/poky-contrib jku/piglit > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/piglit > > Thanks, > Jussi > > > create mode 100644 > meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch > > 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 0000000..d591da5 > --- /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.kukko...@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.kukko...@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 f5ef364..f14a7b4 100644 > --- a/meta/recipes-graphics/piglit/piglit_git.bb > +++ b/meta/recipes-graphics/piglit/piglit_git.bb > @@ -4,6 +4,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-cmake-Link-utils-with-xcb-explicitly.patch \ > " > > # From 2016-07-07 > -- > 2.1.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
