diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2018-01-22 11:17:26 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-26 13:09:09 +0000 |
commit | ed2312a9c3bb26192b928073bdb31ddfa177bb53 (patch) | |
tree | 215a23cd8a7bec08eee35d443a43da0519675be1 | |
parent | 2d678cd3f4746adce9d89b8daa877fd669f2ca2d (diff) | |
download | poky-ed2312a9c3bb26192b928073bdb31ddfa177bb53.tar.gz |
mesa: link mesautil with pthreads
Cherry-pick fix from mesa upstream:
23ce168048 link mesautil with pthreads
link mesautil with pthreads to avoid:
../../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
(From OE-Core rev: f878741d22fbd1582039738c21cf86942fb94327)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch | 54 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_17.3.3.bb | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch new file mode 100644 index 0000000000..38ddf49af6 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> | ||
3 | |||
4 | From 23ce168048698eeea3df6bb8c9de5be3ca4784cd Mon Sep 17 00:00:00 2001 | ||
5 | From: Igor Gnatenko <ignatenko@redhat.com> | ||
6 | Date: Mon, 1 Jan 2018 22:49:00 +0100 | ||
7 | Subject: [PATCH] link mesautil with pthreads | ||
8 | |||
9 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_setname': | ||
10 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: undefined reference to `pthread_setname_np' | ||
11 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_join': | ||
12 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336: undefined reference to `pthread_join' | ||
13 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': | ||
14 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: undefined reference to `pthread_sigmask' | ||
15 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_create': | ||
16 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296: undefined reference to `pthread_create' | ||
17 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': | ||
18 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' | ||
19 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' | ||
20 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `call_once': | ||
21 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once' | ||
22 | ../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': | ||
23 | /builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: undefined reference to `pthread_getcpuclockid' | ||
24 | collect2: error: ld returned 1 exit status | ||
25 | |||
26 | Reviewed-by: Adam Jackson <ajax@redhat.com> | ||
27 | Signed-off-by: Igor Gnatenko <ignatenko@redhat.com> | ||
28 | --- | ||
29 | src/util/Makefile.am | 2 ++ | ||
30 | 1 file changed, 2 insertions(+) | ||
31 | |||
32 | diff --git a/src/util/Makefile.am b/src/util/Makefile.am | ||
33 | index a5241ad27b..633907b9fd 100644 | ||
34 | --- a/src/util/Makefile.am | ||
35 | +++ b/src/util/Makefile.am | ||
36 | @@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ | ||
37 | libxmlconfig.la | ||
38 | |||
39 | AM_CPPFLAGS = \ | ||
40 | + $(PTHREAD_CFLAGS) \ | ||
41 | -I$(top_srcdir)/include | ||
42 | |||
43 | libmesautil_la_CPPFLAGS = \ | ||
44 | @@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \ | ||
45 | $(MESA_UTIL_GENERATED_FILES) | ||
46 | |||
47 | libmesautil_la_LIBADD = \ | ||
48 | + $(PTHREAD_LIBS) \ | ||
49 | $(CLOCK_LIB) \ | ||
50 | $(ZLIB_LIBS) \ | ||
51 | $(LIBATOMIC_LIBS) | ||
52 | -- | ||
53 | 2.14.3 | ||
54 | |||
diff --git a/meta/recipes-graphics/mesa/mesa_17.3.3.bb b/meta/recipes-graphics/mesa/mesa_17.3.3.bb index 6e3f29a2c4..623046e116 100644 --- a/meta/recipes-graphics/mesa/mesa_17.3.3.bb +++ b/meta/recipes-graphics/mesa/mesa_17.3.3.bb | |||
@@ -10,6 +10,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
10 | file://0001-winsys-svga-drm-Include-sys-types.h.patch \ | 10 | file://0001-winsys-svga-drm-Include-sys-types.h.patch \ |
11 | file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ | 11 | file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ |
12 | file://0001-anv_icd.py-improve-reproducible-builds.patch \ | 12 | file://0001-anv_icd.py-improve-reproducible-builds.patch \ |
13 | file://0001-link-mesautil-with-pthreads.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRC_URI[md5sum] = "139b5f608b371c0d4395596162f88791" | 16 | SRC_URI[md5sum] = "139b5f608b371c0d4395596162f88791" |