diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch | 54 |
2 files changed, 0 insertions, 81 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch b/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch deleted file mode 100644 index da7a81f253..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From b474abdd91158a52821c34865277d7de38880529 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Wed, 17 Jan 2018 15:53:29 +0200 | ||
4 | Subject: [PATCH] anv_icd.py: improve reproducible builds | ||
5 | |||
6 | Sort the output to ensure reproducibility | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
11 | --- | ||
12 | src/intel/vulkan/anv_icd.py | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py | ||
16 | index 4ed01fa..31bb068 100644 | ||
17 | --- a/src/intel/vulkan/anv_icd.py | ||
18 | +++ b/src/intel/vulkan/anv_icd.py | ||
19 | @@ -44,4 +44,4 @@ if __name__ == '__main__': | ||
20 | } | ||
21 | |||
22 | with open(args.out, 'w') as f: | ||
23 | - json.dump(json_data, f, indent = 4) | ||
24 | + json.dump(json_data, f, indent = 4, sort_keys=True) | ||
25 | -- | ||
26 | 2.4.0 | ||
27 | |||
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 deleted file mode 100644 index 38ddf49af6..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
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 | |||