From 14dcbf60976fb99938342bd81e6ede6d0f269217 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 29 Jan 2018 18:20:52 +0000 Subject: [PATCH] add patch to fix utils builds --- 0001-link-mesautil-with-pthreads.patch | 51 ++++++++++++++++++++++++++ mesa.spec | 1 + 2 files changed, 52 insertions(+) create mode 100644 0001-link-mesautil-with-pthreads.patch diff --git a/0001-link-mesautil-with-pthreads.patch b/0001-link-mesautil-with-pthreads.patch new file mode 100644 index 0000000..3d9ad38 --- /dev/null +++ b/0001-link-mesautil-with-pthreads.patch @@ -0,0 +1,51 @@ +From 23ce168048698eeea3df6bb8c9de5be3ca4784cd Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 1 Jan 2018 22:49:00 +0100 +Subject: [PATCH 001/607] link mesautil with pthreads + +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_setname': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: undefined reference to `pthread_setname_np' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_join': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336: undefined reference to `pthread_join' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: undefined reference to `pthread_sigmask' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296: undefined reference to `pthread_create' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `call_once': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: undefined reference to `pthread_getcpuclockid' +collect2: error: ld returned 1 exit status + +Reviewed-by: Adam Jackson +Signed-off-by: Igor Gnatenko +--- + src/util/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index a5241ad27b..633907b9fd 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ + libxmlconfig.la + + AM_CPPFLAGS = \ ++ $(PTHREAD_CFLAGS) \ + -I$(top_srcdir)/include + + libmesautil_la_CPPFLAGS = \ +@@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \ + $(MESA_UTIL_GENERATED_FILES) + + libmesautil_la_LIBADD = \ ++ $(PTHREAD_LIBS) \ + $(CLOCK_LIB) \ + $(ZLIB_LIBS) \ + $(LIBATOMIC_LIBS) +-- +2.14.3 + diff --git a/mesa.spec b/mesa.spec index 347c6cd..ff6b725 100644 --- a/mesa.spec +++ b/mesa.spec @@ -82,6 +82,7 @@ Patch4: 0004-bigendian-assert.patch # non-upstreamed ones Patch10: glvnd-fix-gl-dot-pc.patch Patch11: 0001-Fix-linkage-against-shared-glapi.patch +Patch12: 0001-link-mesautil-with-pthreads.patch # backport from upstream