<div dir="ltr">Upstream-Status tag needs to be in the patch you add, not the commit message.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 22 January 2018 at 16:56, Randy MacLeod <span dir="ltr"><<a href="mailto:Randy.MacLeod@windriver.com" target="_blank">Randy.MacLeod@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">Cherry-pick fix from mesa upstream:<br>
23ce168048 link mesautil with pthreads<br>
<br>
</span>link mesautil with pthreads to avoid:<br>
<br>
../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_setname':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../src/util/u_<wbr>thread.h:66: undefined reference to `pthread_setname_np'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `thrd_join':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../include/<wbr>c11/threads_posix.h:336: undefined reference to `pthread_join'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_create':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../src/util/u_<wbr>thread.h:48: undefined reference to `pthread_sigmask'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `thrd_create':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../include/<wbr>c11/threads_posix.h:296: undefined reference to `pthread_create'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_create':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../src/util/u_<wbr>thread.h:50: undefined reference to `pthread_sigmask'<br>
/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../src/util/u_<wbr>thread.h:50: undefined reference to `pthread_sigmask'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `call_once':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../include/<wbr>c11/threads_posix.h:96: undefined reference to `pthread_once'<br>
</span>../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_get_time_nano':<br>
<span class="">/builddir/build/BUILD/mesa-17.<wbr>3.1/src/util/../../src/util/u_<wbr>thread.h:84: undefined reference to `pthread_getcpuclockid'<br>
</span><span class="">collect2: error: ld returned 1 exit status<br>
<br>
</span>Upstream-Status: backport<br>
<span class=""><br>
Signed-off-by: Randy MacLeod <<a href="mailto:Randy.MacLeod@windriver.com">Randy.MacLeod@windriver.com</a>><br>
---<br>
.../files/0001-link-mesautil-<wbr>with-pthreads.patch | 51 ++++++++++++++++++++++<br>
</span> meta/recipes-graphics/mesa/<a href="http://mesa_17.3.3.bb" rel="noreferrer" target="_blank">mes<wbr>a_17.3.3.bb</a> | 1 +<br>
<span class=""> 2 files changed, 52 insertions(+)<br>
create mode 100644 meta/recipes-graphics/mesa/<wbr>files/0001-link-mesautil-with-<wbr>pthreads.patch<br>
<br>
diff --git a/meta/recipes-graphics/mesa/<wbr>files/0001-link-mesautil-with-<wbr>pthreads.patch b/meta/recipes-graphics/mesa/<wbr>files/0001-link-mesautil-with-<wbr>pthreads.patch<br>
new file mode 100644<br>
index 0000000000..193c54661b<br>
--- /dev/null<br>
+++ b/meta/recipes-graphics/mesa/<wbr>files/0001-link-mesautil-with-<wbr>pthreads.patch<br>
@@ -0,0 +1,51 @@<br>
+From 23ce168048698eeea3df6bb8c9de5b<wbr>e3ca4784cd Mon Sep 17 00:00:00 2001<br>
+From: Igor Gnatenko <<a href="mailto:ignatenko@redhat.com">ignatenko@redhat.com</a>><br>
</span><span class="">+Date: Mon, 1 Jan 2018 22:49:00 +0100<br>
+Subject: [PATCH] link mesautil with pthreads<br>
+<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_setname':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../src/<wbr>util/u_thread.h:66: undefined reference to `pthread_setname_np'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `thrd_join':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../include/<wbr>c11/threads_posix.h:336: undefined reference to `pthread_join'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_create':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../src/<wbr>util/u_thread.h:48: undefined reference to `pthread_sigmask'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `thrd_create':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../include/<wbr>c11/threads_posix.h:296: undefined reference to `pthread_create'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_create':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../src/<wbr>util/u_thread.h:50: undefined reference to `pthread_sigmask'<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../src/<wbr>util/u_thread.h:50: undefined reference to `pthread_sigmask'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `call_once':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../include/<wbr>c11/threads_posix.h:96: undefined reference to `pthread_once'<br>
+../../src/util/.libs/<wbr>libmesautil.a(libmesautil_la-<wbr>u_queue.o): In function `u_thread_get_time_nano':<br>
+/builddir/build/BUILD/mesa-<wbr>17.3.1/src/util/../../src/<wbr>util/u_thread.h:84: undefined reference to `pthread_getcpuclockid'<br>
+collect2: error: ld returned 1 exit status<br>
+<br>
+Reviewed-by: Adam Jackson <<a href="mailto:ajax@redhat.com">ajax@redhat.com</a>><br>
</span>+Signed-off-by: Igor Gnatenko <<a href="mailto:ignatenko@redhat.com">ignatenko@redhat.com</a>><br>
<span class="">+---<br>
+ src/util/Makefile.am | 2 ++<br>
+ 1 file changed, 2 insertions(+)<br>
+<br>
+diff --git a/src/util/Makefile.am b/src/util/Makefile.am<br>
+index a5241ad27b..633907b9fd 100644<br>
+--- a/src/util/Makefile.am<br>
++++ b/src/util/Makefile.am<br>
+@@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \<br>
+ <a href="http://libxmlconfig.la" rel="noreferrer" target="_blank">libxmlconfig.la</a><br>
</span><span class="">+<br>
+ AM_CPPFLAGS = \<br>
++ $(PTHREAD_CFLAGS) \<br>
+ -I$(top_srcdir)/include<br>
+<br>
+ libmesautil_la_CPPFLAGS = \<br>
+@@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \<br>
+ $(MESA_UTIL_GENERATED_FILES)<br>
+<br>
+ libmesautil_la_LIBADD = \<br>
++ $(PTHREAD_LIBS) \<br>
+ $(CLOCK_LIB) \<br>
+ $(ZLIB_LIBS) \<br>
+ $(LIBATOMIC_LIBS)<br>
+--<br>
+2.14.3<br>
+<br>
</span>diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_17.3.3.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.3.3.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa_17.3.3.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.3.3.bb</a><br>
index 6e3f29a2c4..623046e116 100644<br>
--- a/meta/recipes-graphics/mesa/<a href="http://mesa_17.3.3.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.3.3.bb</a><br>
+++ b/meta/recipes-graphics/mesa/<a href="http://mesa_17.3.3.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.3.3.bb</a><br>
@@ -10,6 +10,7 @@ SRC_URI = "<a href="https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz" rel="noreferrer" target="_blank">https://mesa.freedesktop.org/<wbr>archive/mesa-${PV}.tar.xz</a> \<br>
file://0001-winsys-svga-drm-<wbr>Include-sys-types.h.patch \<br>
file://0001-Makefile.vulkan.<wbr>am-explictly-add-lib-expat-to-<wbr>intel-.patch \<br>
file://0001-anv_icd.py-<wbr>improve-reproducible-builds.<wbr>patch \<br>
+ file://0001-link-mesautil-<wbr>with-pthreads.patch \<br>
"<br>
<br>
SRC_URI[md5sum] = "<wbr>139b5f608b371c0d4395596162f887<wbr>91"<br>
<span class="">--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
</span><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</blockquote></div><br></div>